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

[trey]

The following commit has been merged in the debian/unstable branch:
commit 1b37ed87124cc893e0af35799973b48e22613c75
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 11 21:38:26 2003 +0000

    	3220349 - assertion failure in [WebFrame _recursiveGoToItem:...] hitting Back while loading movie
    
    	The problem was that when we go back we call stopLoading on the top frame, but
    	that has a bogus optimization to not do any work if state=Completed.  That is a
    	bogus test if a subframe is doing a load.  The fix is to just always tell the
    	dataSources to stopLoading.  They already bail quickly when they are not loading,
    	so there is no significant additional cost.
    
            Reviewed by Richard.
    
            * WebView.subproj/WebFrame.m:
            (-[WebFrame stopLoading]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4082 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6c90b41..b572f09 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2003-04-08  Trey Matteson  <trey at apple.com>
+
+	3220349 - assertion failure in [WebFrame _recursiveGoToItem:...] hitting Back while loading movie
+
+	The problem was that when we go back we call stopLoading on the top frame, but
+	that has a bogus optimization to not do any work if state=Completed.  That is a
+	bogus test if a subframe is doing a load.  The fix is to just always tell the
+	dataSources to stopLoading.  They already bail quickly when they are not loading,
+	so there is no significant additional cost.
+
+        Reviewed by Richard.
+
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame stopLoading]):
+
 === Safari-73 ===
 
 2003-04-10  Richard Williamson   <rjw at apple.com>
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index c45fc54..f0da6bc 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -147,13 +147,10 @@
 {
     [self _invalidatePendingPolicyDecisionCallingDefaultAction:YES];
 
-    if (_private->state != WebFrameStateComplete) {
-        [_private->provisionalDataSource _stopLoading];
-        [_private->dataSource _stopLoading];
-        [_private->scheduledLayoutTimer invalidate];
-        _private->scheduledLayoutTimer = 0;
-    }
-    ASSERT(_private->scheduledLayoutTimer == nil);
+    [_private->provisionalDataSource _stopLoading];
+    [_private->dataSource _stopLoading];
+    [_private->scheduledLayoutTimer invalidate];
+    _private->scheduledLayoutTimer = nil;
 }
 
 

-- 
WebKit Debian packaging