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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 5c4d3a583c6a22fd18d2e53462350f255b587769
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 22 00:20:20 2003 +0000

            Reviewed by John.
    
    	- fixed 3254473 - REGRESSION: nike help page reloads on mouseovers, triggered by onresize function
    
    	REGRESSION: reload loop due to onresize handler (fortune.com, flipdog.com, stanford.edu)
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView layoutToPageWidth:]): Go back to checking for at least one
    	layout instead of last layout event time. Measure size in a way that ignores
    	whether the scrollbares are there or not.
            * WebView.subproj/WebHTMLViewPrivate.h: Remove last layout event time and
    	add back laid out at least once boolean.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4408 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index aa5106b..13e8e24 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2003-05-21  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3254473 - REGRESSION: nike help page reloads on mouseovers, triggered by onresize function
+
+	REGRESSION: reload loop due to onresize handler (fortune.com, flipdog.com, stanford.edu)
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView layoutToPageWidth:]): Go back to checking for at least one
+	layout instead of last layout event time. Measure size in a way that ignores
+	whether the scrollbares are there or not.
+        * WebView.subproj/WebHTMLViewPrivate.h: Remove last layout event time and
+	add back laid out at least once boolean.
+
 2003-05-21  Chris Blumenberg  <cblu at apple.com>
 
 	These problems:
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index e8a3dae..6ec3652 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -330,14 +330,14 @@
     _private->needsLayout = NO;
     
     if (!_private->printing) {
-	NSSize newLayoutSize = [(NSClipView *)[self superview] documentVisibleRect].size;
-	NSEvent *event = [NSApp currentEvent];
-        NSTimeInterval currentEventTime = event == nil ? 0 : [event timestamp];
-        if (_private->firstLayoutEventTime == 0) {
-            _private->firstLayoutEventTime = currentEventTime;
-        } else if (_private->firstLayoutEventTime != currentEventTime && !NSEqualSizes(_private->lastLayoutSize, newLayoutSize)) {
+	// 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)) {
 	    [[self _bridge] sendResizeEvent];
 	}
+	_private->laidOutAtLeastOnce = YES;
 	_private->lastLayoutSize = newLayoutSize;
     }
     
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index ac2932d..6348e2c 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -30,8 +30,8 @@
 
     NSURL *draggingImageURL;
     
-    NSTimeInterval firstLayoutEventTime;
     NSSize lastLayoutSize;
+    BOOL laidOutAtLeastOnce;
     
     WebPluginController *pluginController;
 }

-- 
WebKit Debian packaging