[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 6c77263a63b113dfc1081fb8acb37c846c2b0ba6
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jun 3 22:58:26 2003 +0000

    	Fixed 3263188, 3274636.
    
            Written by Ed Voas.  Reviewed by Richard.
    
            * Carbon.subproj/CarbonUtils.m:
            (WebInitForCarbon):
    	Ensure the process info is correctly initialized so the correct
    	"flavour" (carbon) is detected.
    
            * Carbon.subproj/HIWebView.m:
            (Draw):
    	Always draw the growbox after drawing the web view,
    	assuming overlap.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4477 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/CarbonUtils.m b/WebKit/Carbon.subproj/CarbonUtils.m
index e548f75..a113638 100644
--- a/WebKit/Carbon.subproj/CarbonUtils.m
+++ b/WebKit/Carbon.subproj/CarbonUtils.m
@@ -22,6 +22,11 @@ WebInitForCarbon()
 
     if ( !sAppKitLoaded )
     {
+        ProcessSerialNumber    process;
+
+        // Force us to register with process server, this ensure that the process
+        // "flavour" is correctly established.
+        GetCurrentProcess( &process ); 
         NSApplicationLoad();
         
         sPool = [[NSAutoreleasePool allocWithZone:NULL] init];
diff --git a/WebKit/Carbon.subproj/HIWebView.m b/WebKit/Carbon.subproj/HIWebView.m
index f0e0a61..bc4e452 100644
--- a/WebKit/Carbon.subproj/HIWebView.m
+++ b/WebKit/Carbon.subproj/HIWebView.m
@@ -349,9 +349,32 @@ Draw( HIWebView* inView, RgnHandle limitRgn, CGContextRef inContext )
     else
         [inView->fWebView displayRect:*(NSRect*)&hiRect];
 
-	[[inView->fKitWindow _threadContext] setCGContext: temp];
+    [[inView->fKitWindow _threadContext] setCGContext: temp];
 
-	CGContextRelease( temp );
+    if ( !inView->fIsComposited )
+    {
+        HIViewRef      view;
+        HIViewFindByID( HIViewGetRoot( GetControlOwner( inView->fViewRef ) ), kHIViewWindowGrowBoxID, &view );
+        if ( view )
+        {
+            HIRect     frame;
+
+            HIViewGetBounds( view, &frame );
+            HIViewConvertRect( &frame, view, NULL );
+
+            hiRect.origin.x = drawRect.left;
+            hiRect.origin.y = drawRect.top;
+            hiRect.size.width = drawRect.right - drawRect.left;
+            hiRect.size.height = drawRect.bottom - drawRect.top;
+
+            HIViewConvertRect( &hiRect, inView->fViewRef, NULL );
+
+            if ( CGRectIntersectsRect( frame, hiRect ) )
+                HIViewSetNeedsDisplay( view, true );
+        }
+     }
+
+    CGContextRelease( temp );
     
     if ( createdContext )
     {
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6e44e0d..cef33cc 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2003-06-03  Richard Williamson   <rjw at apple.com>
+	
+	Fixed 3263188, 3274636.
+	
+        Written by Ed Voas.  Reviewed by Richard.
+
+        * Carbon.subproj/CarbonUtils.m:
+        (WebInitForCarbon):
+	Ensure the process info is correctly initialized so the correct
+	"flavour" (carbon) is detected.
+
+        * Carbon.subproj/HIWebView.m:
+        (Draw):
+	Always draw the growbox after drawing the web view,
+	assuming overlap.
+
 === Safari-82 ===
 
 2003-06-03  Chris Blumenberg  <cblu at apple.com>

-- 
WebKit Debian packaging