[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 387d2ed0f69503701702867b0655ee2167f99b39
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 11 02:16:02 2003 +0000

            Fix performance regression with iBench (post 71).  The iBench cheat was being defeated.
    
            Ensure that the layout timer is always invalidated when a frame completes
            or is cancelled.
    
            Reviewed by mjs & gramps.
    
            * WebView.subproj/WebFrame.m:
            (-[WebFrame stopLoading]):
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _setState:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4070 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8b6690c..d6c536d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2003-04-10  Richard Williamson   <rjw at apple.com>
+
+        Fix performance regression with iBench (post 71).  The iBench cheat was being defeated.
+        
+        Ensure that the layout timer is always invalidated when a frame completes 
+        or is cancelled.
+        
+        Reviewed by mjs & gramps.
+
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame stopLoading]):
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _setState:]):
+
 2003-04-10  Trey Matteson  <trey at apple.com>
 
 	3224973 - Safari sometimes stores data for AUTOCOMPLETE=OFF fields and password fields
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 5703527..c45fc54 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -150,7 +150,8 @@
     if (_private->state != WebFrameStateComplete) {
         [_private->provisionalDataSource _stopLoading];
         [_private->dataSource _stopLoading];
-        [_private->scheduledLayoutTimer fire];
+        [_private->scheduledLayoutTimer invalidate];
+        _private->scheduledLayoutTimer = 0;
     }
     ASSERT(_private->scheduledLayoutTimer == nil);
 }
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 6a1d5a3..f439905 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -840,8 +840,8 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
         // FIXME: This overrides the setCopiesOnScroll setting done by
         // WebCore based on whether the page's contents are dynamic or not.
         [[sv contentView] setCopiesOnScroll:YES];
-        [_private->scheduledLayoutTimer fire];
-        ASSERT(_private->scheduledLayoutTimer == nil);
+        [_private->scheduledLayoutTimer invalidate];
+        _private->scheduledLayoutTimer = 0;
         [_private setPreviousItem:nil];
         _timeOfLastCompletedLoad = CFAbsoluteTimeGetCurrent();
     }

-- 
WebKit Debian packaging