[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 83212c1f0369a70e6296698433b6d9baf5f28418
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 19 22:49:06 2002 +0000

    	Make sure that if the scrollers are shown/hidden that we
    	force an immediate layout, since if we don't, an intervening
    	display can cause us to show scrollbars when they really
    	shouldn't be there.
    
            * WebView.subproj/WebDynamicScrollBarsView.m:
            (-[WebDynamicScrollBarsView updateScrollers]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2764 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 169eb90..87afb75 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-19  David Hyatt  <hyatt at apple.com>
+
+	Make sure that if the scrollers are shown/hidden that we
+	force an immediate layout, since if we don't, an intervening
+	display can cause us to show scrollbars when they really
+	shouldn't be there.
+	
+        * WebView.subproj/WebDynamicScrollBarsView.m:
+        (-[WebDynamicScrollBarsView updateScrollers]):
+
 2002-11-19  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3100597 - repro NSArray exception using contextual menu
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 169eb90..87afb75 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-11-19  David Hyatt  <hyatt at apple.com>
+
+	Make sure that if the scrollers are shown/hidden that we
+	force an immediate layout, since if we don't, an intervening
+	display can cause us to show scrollbars when they really
+	shouldn't be there.
+	
+        * WebView.subproj/WebDynamicScrollBarsView.m:
+        (-[WebDynamicScrollBarsView updateScrollers]):
+
 2002-11-19  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3100597 - repro NSArray exception using contextual menu
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
index d0cfaa2..fd4a679 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
@@ -22,6 +22,11 @@
     // trying to figure out of the second pass is needed or not.
     
     int pass;
+    BOOL hasVerticalScroller = [self hasVerticalScroller];
+    BOOL hasHorizontalScroller = [self hasHorizontalScroller];
+    BOOL oldHasVertical = hasVerticalScroller;
+    BOOL oldHasHorizontal = hasHorizontalScroller;
+    
     for (pass = 0; pass < 2; pass++) {
         BOOL scrollsVertically;
         BOOL scrollsHorizontally;
@@ -33,7 +38,9 @@
             // Do a layout if pending, before checking if scrollbars are needed.
             // This fixes 2969367, although may introduce a slowdown in live resize performance.
             NSView *documentView = [self documentView];
-            if ([documentView inLiveResize] && [documentView conformsToProtocol:@protocol(WebDocumentView)]) {
+            if ((hasVerticalScroller != oldHasVertical ||
+                hasHorizontalScroller != oldHasHorizontal || [documentView inLiveResize]) && [documentView conformsToProtocol:@protocol(WebDocumentView)]) {
+                [(id <WebDocumentView>)documentView setNeedsLayout: YES];
                 [(id <WebDocumentView>)documentView layout];
             }
             
@@ -52,6 +59,8 @@
     
         [self setHasVerticalScroller:scrollsVertically];
         [self setHasHorizontalScroller:scrollsHorizontally];
+        hasVerticalScroller = scrollsVertically;
+        hasHorizontalScroller = scrollsHorizontally;
     }
 }
 

-- 
WebKit Debian packaging