[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 e66f7bf9e8550ba06ebdeef2f5ccb7602c071a84
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 26 23:09:47 2003 +0000

            Reviewed by Maciej.
    
            - fixed 3321247 -- window size box disappears from Help window (caused by WebKit NSView hackery)
    
            * WebView.subproj/WebHTMLViewPrivate.m:
            (-[WebHTMLView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:]),
            (-[WebHTMLView _recursiveDisplayAllDirtyWithLockFocus:visRect:]):
            Don't propagate dirty rects at all. This was causing problems because now the AppKit uses
            dirty regions, not dirty rects. In AppKit-722 and newer, _setDrawsDescendants: takes care of this
            for us so we don't have to do anything at all.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4889 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ff46a70..1bb41b3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,18 @@
 2003-08-26  Darin Adler  <darin at apple.com>
 
+        Reviewed by Maciej.
+
+        - fixed 3321247 -- window size box disappears from Help window (caused by WebKit NSView hackery)
+
+        * WebView.subproj/WebHTMLViewPrivate.m:
+        (-[WebHTMLView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:]),
+        (-[WebHTMLView _recursiveDisplayAllDirtyWithLockFocus:visRect:]):
+        Don't propagate dirty rects at all. This was causing problems because now the AppKit uses
+        dirty regions, not dirty rects. In AppKit-722 and newer, _setDrawsDescendants: takes care of this
+        for us so we don't have to do anything at all.
+
+2003-08-26  Darin Adler  <darin at apple.com>
+
         Reviewed by John.
 
         - fixed 3392650 -- REGRESSION?: assertion fails trying Apple-hosted page load test while not on Apple network
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index d745c29..9660351 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -197,7 +197,11 @@ static BOOL forceRealHitTest = NO;
 // Don't let AppKit even draw subviews. We take care of that.
 - (void)_recursiveDisplayRectIfNeededIgnoringOpacity:(NSRect)rect isVisibleRect:(BOOL)isVisibleRect rectIsVisibleRectForView:(NSView *)visibleView topView:(BOOL)topView
 {
-    [_subviews makeObjectsPerformSelector:@selector(_web_propagateDirtyRectToAncestor)];
+    // The _setDrawsDescendants: mechanism now takes care of this for us.
+    // But only in AppKit-722 and newer.
+    if (NSAppKitVersionNumber < 722) {
+        [_subviews makeObjectsPerformSelector:@selector(_web_propagateDirtyRectToAncestor)];
+    }
     [self _setAsideSubviews];
     [super _recursiveDisplayRectIfNeededIgnoringOpacity:rect isVisibleRect:isVisibleRect
         rectIsVisibleRectForView:visibleView topView:topView];
@@ -210,7 +214,11 @@ static BOOL forceRealHitTest = NO;
     BOOL needToSetAsideSubviews = !_private->subviewsSetAside;
     
     if (needToSetAsideSubviews) {
-        [_subviews makeObjectsPerformSelector:@selector(_web_propagateDirtyRectToAncestor)];
+        // The _setDrawsDescendants: mechanism now takes care of this for us.
+        // But only in AppKit-722 and newer.
+        if (NSAppKitVersionNumber < 722) {
+            [_subviews makeObjectsPerformSelector:@selector(_web_propagateDirtyRectToAncestor)];
+        }
         [self _setAsideSubviews];
     }
     

-- 
WebKit Debian packaging