[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 454c08f4069eae50405bc957d2308deb0eeaff5b
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 13 21:11:21 2003 +0000

    	Fix for 3291319, scrolling is much worse since 79.  The problem
    	was a fix for resize events that needed to use the scrollview size
    	and not the document view size inside the scrollview.
    
            Reviewed by darin
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView layoutToPageWidth:]):
            * WebView.subproj/WebHTMLViewPrivate.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4544 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 397518f..751c1eb 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2003-06-13  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3291319, scrolling is much worse since 79.  The problem
+	was a fix for resize events that needed to use the scrollview size
+	and not the document view size inside the scrollview.
+	
+        Reviewed by darin
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView layoutToPageWidth:]):
+        * WebView.subproj/WebHTMLViewPrivate.h:
+
 2003-06-13  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed previous " Reviewed by" string.
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 6ec3652..e1c13a6 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -333,12 +333,13 @@
 	// get size of the containing dynamic scrollview, so
 	// appearance and disappearance of scrollbars will not show up
 	// as a size change
-	NSSize newLayoutSize = [[[self superview] superview] frame].size;
-	if (_private->laidOutAtLeastOnce && !NSEqualSizes(_private->lastLayoutSize, newLayoutSize)) {
+	NSSize newLayoutFrameSize = [[[self superview] superview] frame].size;
+	if (_private->laidOutAtLeastOnce && !NSEqualSizes(_private->lastLayoutFrameSize, newLayoutFrameSize)) {
 	    [[self _bridge] sendResizeEvent];
 	}
 	_private->laidOutAtLeastOnce = YES;
-	_private->lastLayoutSize = newLayoutSize;
+	_private->lastLayoutSize = [(NSClipView *)[self superview] documentVisibleRect].size;
+        _private->lastLayoutFrameSize = newLayoutFrameSize;
     }
     
     [self setNeedsDisplay:YES];
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index 6348e2c..322cc10 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -31,6 +31,7 @@
     NSURL *draggingImageURL;
     
     NSSize lastLayoutSize;
+    NSSize lastLayoutFrameSize;
     BOOL laidOutAtLeastOnce;
     
     WebPluginController *pluginController;

-- 
WebKit Debian packaging