Fix for numerous regressions caused by an inadvertent renaming of the recursiveDisplay

[WebKit-https.git] / WebKit / WebView.subproj / WebHTMLView.m

diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 0c2b5b6d6a6da4d48f4a024201b1b16a1ffdf73b..7a0ea4af4eaf651d8913c87844946881ae40e657 100644 (file)
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -69,7 +69,7 @@ static BOOL forceRealHitTest = NO;
 
 
 @interface NSView (AppKitSecretsIKnowAbout)
 
 
 @interface NSView (AppKitSecretsIKnowAbout)

-- (void)_recursiveDisplayRectIfNeededIgnoringOpacity:(NSRect)rect isVisibleRect:(BOOL)isVisibleRect rectIsVisibleRectForView:(NSView *)visibleView testDirtyRect:(BOOL)testDirtyRect;
+- (void)_recursiveDisplayRectIfNeededIgnoringOpacity:(NSRect)rect isVisibleRect:(BOOL)isVisibleRect rectIsVisibleRectForView:(NSView *)visibleView topView:(BOOL)topView;

 - (void)_recursiveDisplayAllDirtyWithLockFocus:(BOOL)needsLockFocus visRect:(NSRect)visRect;
 - (NSRect)_dirtyRect;
 - (void)_setDrawsOwnDescendants:(BOOL)drawsOwnDescendants;
 - (void)_recursiveDisplayAllDirtyWithLockFocus:(BOOL)needsLockFocus visRect:(NSRect)visRect;
 - (NSRect)_dirtyRect;
 - (void)_setDrawsOwnDescendants:(BOOL)drawsOwnDescendants;


@@ -230,7 +230,7 @@ static BOOL forceRealHitTest = NO;
 }
 
 // Don't let AppKit even draw subviews. We take care of that.
 }
 
 // Don't let AppKit even draw subviews. We take care of that.

-- (void)_recursiveDisplayRectIfNeededIgnoringOpacity:(NSRect)rect isVisibleRect:(BOOL)isVisibleRect rectIsVisibleRectForView:(NSView *)visibleView testDirtyRect:(BOOL)testDirtyRect
+- (void)_recursiveDisplayRectIfNeededIgnoringOpacity:(NSRect)rect isVisibleRect:(BOOL)isVisibleRect rectIsVisibleRectForView:(NSView *)visibleView topView:(BOOL)topView

 {
     // This helps when we print as part of a larger print process.
     // If the WebHTMLView itself is what we're printing, then we will never have to do this.
 {
     // This helps when we print as part of a larger print process.
     // If the WebHTMLView itself is what we're printing, then we will never have to do this.


@@ -248,7 +248,7 @@ static BOOL forceRealHitTest = NO;
 
     [self _setAsideSubviews];
     [super _recursiveDisplayRectIfNeededIgnoringOpacity:rect isVisibleRect:isVisibleRect
 
     [self _setAsideSubviews];
     [super _recursiveDisplayRectIfNeededIgnoringOpacity:rect isVisibleRect:isVisibleRect

-        rectIsVisibleRectForView:visibleView testDirtyRect:testDirtyRect];
+        rectIsVisibleRectForView:visibleView topView:topView];

     [self _restoreSubviews];
 
     if (wasInPrintingMode != isPrinting) {
     [self _restoreSubviews];
 
     if (wasInPrintingMode != isPrinting) {