[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 b886fcdbcf039694457ea2d3b5c4121b5719bf82
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 10 00:44:54 2004 +0000

            - rolled out most of Dave's change for 3510669 and 3515442; it is not working yet
    
            * WebView.subproj/WebHTMLViewPrivate.h:
            * WebView.subproj/WebHTMLView.m:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5883 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a70081e..fcb691d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-09  Darin Adler  <darin at apple.com>
+
+        - rolled out most of Dave's change for 3510669 and 3515442; it is not working yet
+
+        * WebView.subproj/WebHTMLViewPrivate.h:
+        * WebView.subproj/WebHTMLView.m:
+
 2004-01-09  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Chris.
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 2873cba..35eba4d 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -741,7 +741,9 @@ static WebHTMLView *lastHitView = nil;
             displayRect = NSIntersectionRect(displayRect, dirtyRect);
         }
         if (!NSIsEmptyRect(displayRect)) {
-            if (_private->needsToApplyStyles || [[self _bridge] needsLayout])
+            if ([[self _bridge] needsLayout])
+                _private->needsLayout = YES;
+            if (_private->needsToApplyStyles || _private->needsLayout)
                 [self layout];
         }
     }
@@ -885,7 +887,8 @@ static WebHTMLView *lastHitView = nil;
     _private = [[WebHTMLViewPrivate alloc] init];
 
     _private->pluginController = [[WebPluginController alloc] initWithHTMLView:self];
-    
+    _private->needsLayout = YES;
+
     return self;
 }
 
@@ -1174,7 +1177,7 @@ static WebHTMLView *lastHitView = nil;
     [[self window] setAcceptsMouseMovedEvents: YES];
     [[self window] _setShouldPostEventNotifications: YES];
 
-    if (![[self _bridge] needsLayout]) {
+    if (!_private->needsLayout) {
         return;
     }
 
@@ -1189,7 +1192,8 @@ 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
@@ -1286,8 +1290,7 @@ static WebHTMLView *lastHitView = nil;
 - (void)setNeedsLayout: (BOOL)flag
 {
     LOG(View, "%@ flag = %d", self, (int)flag);
-    if (flag)
-        [[self _bridge] setNeedsLayout];
+    _private->needsLayout = flag;
 }
 
 
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index 3aa6f0d..21fa082 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -16,6 +16,7 @@
 @interface WebHTMLViewPrivate : NSObject
 {
 @public
+    BOOL needsLayout;
     BOOL needsToApplyStyles;
     BOOL inWindow;
     BOOL inNextValidKeyView;

-- 
WebKit Debian packaging