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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 6e34cf67e487278094a8fd36f34488db5f2da132
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 16 22:41:13 2002 +0000

            Fixed 2969367.  Ensure layout happens before doing check
            to determine if scrollbars are needed.  Ahhh, dynamic
            scrollbars work so much better now.
    
            * WebView.subproj/WebDynamicScrollBarsView.m:
            (-[WebDynamicScrollBarsView updateScrollers]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2343 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f600c10..763bb58 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-10-16  Richard Williamson  <rjw at apple.com>
+
+        Fixed 2969367.  Ensure layout happens before doing check
+        to determine if scrollbars are needed.  Ahhh, dynamic
+        scrollbars work so much better now.
+        
+        * WebView.subproj/WebDynamicScrollBarsView.m:
+        (-[WebDynamicScrollBarsView updateScrollers]):
+
 2002-10-16  Darin Adler  <darin at apple.com>
 
 	Fixed the problem where we would leave white bits when making the window larger.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f600c10..763bb58 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-10-16  Richard Williamson  <rjw at apple.com>
+
+        Fixed 2969367.  Ensure layout happens before doing check
+        to determine if scrollbars are needed.  Ahhh, dynamic
+        scrollbars work so much better now.
+        
+        * WebView.subproj/WebDynamicScrollBarsView.m:
+        (-[WebDynamicScrollBarsView updateScrollers]):
+
 2002-10-16  Darin Adler  <darin at apple.com>
 
 	Fixed the problem where we would leave white bits when making the window larger.
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
index 57a9a8a..45c9c7f 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
@@ -8,6 +8,9 @@
 
 #import <WebKit/WebDynamicScrollBarsView.h>
 
+#import <WebKit/WebDocument.h>
+#import <WebKit/WebView.h>
+
 @implementation WebDynamicScrollBarsView
 
 - (void)updateScrollers
@@ -19,6 +22,11 @@
         scrollsVertically = NO;
         scrollsHorizontally = NO;
     } else {
+        // Force a layout before checking if scrollbars are needed.
+        // This fixes 2969367, although may introduce a slowdown in
+        // live resize performance.
+        [((id<WebDocumentView>)[self documentView]) layout];
+        
         NSSize documentSize = [[self documentView] frame].size;
         NSSize frameSize = [self frame].size;
         

-- 
WebKit Debian packaging