[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 fed49cbb8176906d616f4ad9aa572fc24848154d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun May 11 15:04:33 2003 +0000

            Reviewed by John.
    
    	- fixed 3254473 - REGRESSION: reload loop due to onresize handler (fortune.com, flipdog.com, stanford.edu)
    
            * WebView.subproj/WebHTMLView.m: (-[WebHTMLView layoutToPageWidth:]): Don't send out a resize event any
            time during the first event that results in a layout. The old check was merely for the first layout,
            but we need to ignore any number of layouts that are all part of handling a first event. Some day we
            may need to refine this rule even further, but this fixes the present bug.
    
            * WebView.subproj/WebHTMLViewPrivate.h: Goodbye laidOutAtLeastOnce, hello firstLayoutEventTime.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4347 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ab263ba..606fa8f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,18 @@
 2003-05-10  Darin Adler  <darin at apple.com>
 
+        Reviewed by John.
+
+	- fixed 3254473 - REGRESSION: reload loop due to onresize handler (fortune.com, flipdog.com, stanford.edu)
+
+        * WebView.subproj/WebHTMLView.m: (-[WebHTMLView layoutToPageWidth:]): Don't send out a resize event any
+        time during the first event that results in a layout. The old check was merely for the first layout,
+        but we need to ignore any number of layouts that are all part of handling a first event. Some day we
+        may need to refine this rule even further, but this fixes the present bug.
+        
+        * WebView.subproj/WebHTMLViewPrivate.h: Goodbye laidOutAtLeastOnce, hello firstLayoutEventTime.
+
+2003-05-10  Darin Adler  <darin at apple.com>
+
         Reviewed by Maciej.
 
 	- fixed 3250119 -- REGRESSION: WebFrame leaked after showing pop-up menu
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 26065b1..e304d34 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -331,11 +331,13 @@
     
     if (!_private->printing) {
 	NSSize newLayoutSize = [(NSClipView *)[self superview] documentVisibleRect].size;
-	if (_private->laidOutAtLeastOnce && !NSEqualSizes(_private->lastLayoutSize, newLayoutSize)) {
+	NSTimeInterval currentEventTime = [[NSApp currentEvent] timestamp];
+        if (_private->firstLayoutEventTime == 0) {
+            _private->firstLayoutEventTime = currentEventTime;
+        } else if (_private->firstLayoutEventTime != currentEventTime && !NSEqualSizes(_private->lastLayoutSize, newLayoutSize)) {
 	    [[self _bridge] sendResizeEvent];
 	}
 	_private->lastLayoutSize = newLayoutSize;
-	_private->laidOutAtLeastOnce = YES;
     }
     
     [self setNeedsDisplay:YES];
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index 88fc683..ac2932d 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -22,7 +22,6 @@
     BOOL inNextValidKeyView;
     BOOL ignoringMouseDraggedEvents;
     BOOL printing;
-    BOOL laidOutAtLeastOnce;
     
     id savedSubviews;
     BOOL subviewsSetAside;
@@ -31,6 +30,7 @@
 
     NSURL *draggingImageURL;
     
+    NSTimeInterval firstLayoutEventTime;
     NSSize lastLayoutSize;
     
     WebPluginController *pluginController;

-- 
WebKit Debian packaging