[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 aa3bed10856b5a17ec95620d55cc3bc75a2a9526
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 23 17:22:45 2002 +0000

            * WebView.subproj/WebHTMLViewPrivate.m:
            (-[WebHTMLView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:]):
    	Don't special case the top level frame's view so much.
            (-[WebHTMLView _recursiveDisplayAllDirtyWithLockFocus:visRect:]): Ditto.
            (-[NSView _web_propagateDirtyRectToAncestor]): Use public method here instead of private.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2122 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 24e478e..0184c8f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-09-23  Darin Adler  <darin at apple.com>
+
+        * WebView.subproj/WebHTMLViewPrivate.m:
+        (-[WebHTMLView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:]):
+	Don't special case the top level frame's view so much.
+        (-[WebHTMLView _recursiveDisplayAllDirtyWithLockFocus:visRect:]): Ditto.
+        (-[NSView _web_propagateDirtyRectToAncestor]): Use public method here instead of private.
+
 2002-09-23  Ken Kocienda  <kocienda at apple.com>
 
         * WebCoreSupport.subproj/WebBridge.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 24e478e..0184c8f 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-09-23  Darin Adler  <darin at apple.com>
+
+        * WebView.subproj/WebHTMLViewPrivate.m:
+        (-[WebHTMLView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:]):
+	Don't special case the top level frame's view so much.
+        (-[WebHTMLView _recursiveDisplayAllDirtyWithLockFocus:visRect:]): Ditto.
+        (-[NSView _web_propagateDirtyRectToAncestor]): Use public method here instead of private.
+
 2002-09-23  Ken Kocienda  <kocienda at apple.com>
 
         * WebCoreSupport.subproj/WebBridge.m:
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 66119c7..0177f13 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -28,7 +28,6 @@
 - (void)_recursiveDisplayRectIfNeededIgnoringOpacity:(NSRect)rect isVisibleRect:(BOOL)isVisibleRect rectIsVisibleRectForView:(NSView *)visibleView topView:(BOOL)topView;
 - (void)_recursiveDisplayAllDirtyWithLockFocus:(BOOL)needsLockFocus visRect:(NSRect)visRect;
 - (NSRect)_dirtyRect;
-- (NSRect)_convertRectToSuperview:(NSRect)rect;
 - (void)_drawRect:(NSRect)rect clip:(BOOL)clip;
 @end
 
@@ -170,33 +169,27 @@ BOOL _modifierTrackingEnabled = FALSE;
 // 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
 {
-    BOOL setAsideSubviews = [self _isMainFrame];
-    
-    if (setAsideSubviews) {
-        [_subviews makeObjectsPerformSelector:@selector(_web_propagateDirtyRectToAncestor)];
-    
-        ASSERT(!_private->subviewsSetAside);
-        ASSERT(_private->savedSubviews == nil);
-        _private->savedSubviews = _subviews;
-        _subviews = nil;
-        _private->subviewsSetAside = YES;
-    }
+    [_subviews makeObjectsPerformSelector:@selector(_web_propagateDirtyRectToAncestor)];
+
+    ASSERT(!_private->subviewsSetAside);
+    ASSERT(_private->savedSubviews == nil);
+    _private->savedSubviews = _subviews;
+    _subviews = nil;
+    _private->subviewsSetAside = YES;
     
     [super _recursiveDisplayRectIfNeededIgnoringOpacity:rect isVisibleRect:isVisibleRect
         rectIsVisibleRectForView:visibleView topView:topView];
     
-    if (setAsideSubviews) {
-        ASSERT(_subviews == nil);
-        _subviews = _private->savedSubviews;
-        _private->savedSubviews = nil;
-        _private->subviewsSetAside = NO;
-    }
+    ASSERT(_subviews == nil);
+    _subviews = _private->savedSubviews;
+    _private->savedSubviews = nil;
+    _private->subviewsSetAside = NO;
 }
 
 // Don't let AppKit even draw subviews. We take care of that.
 - (void)_recursiveDisplayAllDirtyWithLockFocus:(BOOL)needsLockFocus visRect:(NSRect)visRect
 {
-    BOOL setAsideSubviews = [self _isMainFrame] && !_private->subviewsSetAside;
+    BOOL setAsideSubviews = !_private->subviewsSetAside;
     
     if (setAsideSubviews) {
         [_subviews makeObjectsPerformSelector:@selector(_web_propagateDirtyRectToAncestor)];
@@ -234,7 +227,7 @@ BOOL _modifierTrackingEnabled = FALSE;
 {
     [_subviews makeObjectsPerformSelector:@selector(_web_propagateDirtyRectToAncestor)];
     if ([self needsDisplay]) {
-        [[self superview] setNeedsDisplayInRect:[self _convertRectToSuperview:[self _dirtyRect]]];
+        [[self superview] setNeedsDisplayInRect:[self convertRect:[self _dirtyRect] toView:[self superview]]];
     }
 }
 

-- 
WebKit Debian packaging