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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 0536ecf422536d4eb007005722686dbd591897a9
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 9 22:43:31 2004 +0000

    	Fixes for 3510669 and 3515442, blank frame problems caused by WebKit's resizing not scheduling actual
    	layouts via WebCore.
    
            Reviewed by darin
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView _web_layoutIfNeededRecursive:testDirtyRect:]):
            (-[WebHTMLView initWithFrame:]):
            (-[WebHTMLView layoutToMinimumPageWidth:maximumPageWidth:adjustingViewSize:]):
            (-[WebHTMLView setNeedsLayout:]):
            * WebView.subproj/WebHTMLViewPrivate.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5880 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a63d19c..84d6bc3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2004-01-09  David Hyatt  <hyatt at apple.com>
+
+	Fixes for 3510669 and 3515442, blank frame problems caused by WebKit's resizing not scheduling actual
+	layouts via WebCore.
+	
+        Reviewed by darin
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView _web_layoutIfNeededRecursive:testDirtyRect:]):
+        (-[WebHTMLView initWithFrame:]):
+        (-[WebHTMLView layoutToMinimumPageWidth:maximumPageWidth:adjustingViewSize:]):
+        (-[WebHTMLView setNeedsLayout:]):
+        * WebView.subproj/WebHTMLViewPrivate.h:
+
 2004-01-09  Darin Adler  <darin at apple.com>
 
         Reviewed by Chris.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 99ea0db..656fcc5 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -691,13 +691,6 @@
     }
 }
 
-- (void)setNeedsLayout
-{
-    NSView <WebDocumentView> *view = [[_frame frameView] documentView];
-    [view setNeedsLayout:YES];
-    [view setNeedsDisplay:YES];
-}
-
 // OK to be an NSString rather than an NSURL.
 // This URL is only used for coloring visited links.
 - (NSString *)requestedURLString
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 35eba4d..2873cba 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -741,9 +741,7 @@ static WebHTMLView *lastHitView = nil;
             displayRect = NSIntersectionRect(displayRect, dirtyRect);
         }
         if (!NSIsEmptyRect(displayRect)) {
-            if ([[self _bridge] needsLayout])
-                _private->needsLayout = YES;
-            if (_private->needsToApplyStyles || _private->needsLayout)
+            if (_private->needsToApplyStyles || [[self _bridge] needsLayout])
                 [self layout];
         }
     }
@@ -887,8 +885,7 @@ static WebHTMLView *lastHitView = nil;
     _private = [[WebHTMLViewPrivate alloc] init];
 
     _private->pluginController = [[WebPluginController alloc] initWithHTMLView:self];
-    _private->needsLayout = YES;
-
+    
     return self;
 }
 
@@ -1177,7 +1174,7 @@ static WebHTMLView *lastHitView = nil;
     [[self window] setAcceptsMouseMovedEvents: YES];
     [[self window] _setShouldPostEventNotifications: YES];
 
-    if (!_private->needsLayout) {
+    if (![[self _bridge] needsLayout]) {
         return;
     }
 
@@ -1192,8 +1189,7 @@ static WebHTMLView *lastHitView = nil;
     } else {
         [[self _bridge] forceLayoutAdjustingViewSize:adjustViewSize];
     }
-    _private->needsLayout = NO;
-    
+
     if (!_private->printing) {
 	// get size of the containing dynamic scrollview, so
 	// appearance and disappearance of scrollbars will not show up
@@ -1290,7 +1286,8 @@ static WebHTMLView *lastHitView = nil;
 - (void)setNeedsLayout: (BOOL)flag
 {
     LOG(View, "%@ flag = %d", self, (int)flag);
-    _private->needsLayout = flag;
+    if (flag)
+        [[self _bridge] setNeedsLayout];
 }
 
 
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index 21fa082..3aa6f0d 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -16,7 +16,6 @@
 @interface WebHTMLViewPrivate : NSObject
 {
 @public
-    BOOL needsLayout;
     BOOL needsToApplyStyles;
     BOOL inWindow;
     BOOL inNextValidKeyView;

-- 
WebKit Debian packaging