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

[darin]

The following commit has been merged in the debian/unstable branch:
commit e95b8af85a5fa47fce893a2bd8d3504ceb07d830
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 19 05:49:18 2002 +0000

            Reviewed by Richard.
    
    	- fixed 3127490 -- pages w/frames sometimes show up blank
    
            * WebView.subproj/WebHTMLView.m: (-[WebHTMLView drawRect:]):
    	Updated the optimization where we draw the entire view if we did a layout
    	so that it works properly for the case where the clip is narrower because of
    	the parent WebHTMLView.
    
            * English.lproj/StringsNotToBeLocalized.txt: Updated for recent changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3131 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e4761a6..7819b7b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-12-18  Darin Adler  <darin at apple.com>
+
+        Reviewed by Richard.
+
+	- fixed 3127490 -- pages w/frames sometimes show up blank
+
+        * WebView.subproj/WebHTMLView.m: (-[WebHTMLView drawRect:]):
+	Updated the optimization where we draw the entire view if we did a layout
+	so that it works properly for the case where the clip is narrower because of
+	the parent WebHTMLView.
+
+        * English.lproj/StringsNotToBeLocalized.txt: Updated for recent changes.
+
 === Alexander-40 ===
 
 2002-12-18  Trey Matteson  <trey at apple.com>
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 4ed5277..882b780 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -232,6 +232,7 @@ History.subproj/WebHistoryItem.m:"children"
 History.subproj/WebHistoryItem.m:"title"
 Misc.subproj/WebKitLogging.m
 Plugins.subproj/WebBasePluginPackage.m:"name: %@\npath: %@\nmimeTypes:\n%@\npluginDescription:%@"
+Plugins.subproj/WebNetscapePluginPackage.m:"RealPlayer"
 Plugins.subproj/WebNetscapePluginPackage.m:"main"
 WebCoreSupport.subproj/WebBridge.m:"height"
 WebCoreSupport.subproj/WebBridge.m:"width"
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 0de2afc..5a8ed5e 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -498,8 +498,21 @@
     [self layout];
 
     if (didReapplyStylesOrLayout) {
-        rect = [self visibleRect];
-        [self setNeedsDisplay:NO];
+        // If we reapplied styles or did layout, we would like to draw as much as possible right now.
+        // If we can draw the entire view, then we don't need to come back and display, even though
+        // layout will have called setNeedsDisplay:YES to make that happen.
+        NSRect visibleRect = [self visibleRect];
+        CGRect clipBoundingBoxCG = CGContextGetClipBoundingBox((CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]);
+        NSRect clipBoundingBox = NSMakeRect(clipBoundingBoxCG.origin.x, clipBoundingBoxCG.origin.y,
+            clipBoundingBoxCG.size.width, clipBoundingBoxCG.size.height);
+        // If the clip is such that we can draw the entire view instead of just the requested bit,
+        // then we will do just that. Note that this works only for rectangular clip, because we
+        // are only checking if the clip's bounding box contains the rect; we would prefer to check
+        // if the clip contained it, but that's not possible.
+        if (NSContainsRect(clipBoundingBox, visibleRect)) {
+            rect = visibleRect;
+            [self setNeedsDisplay:NO];
+        }
     }
     
 #ifdef _KWQ_TIMING

-- 
WebKit Debian packaging