[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 1bc7787bbdcb3a9ffe4dbe68df7f4e5bda5abb1b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 26 18:57:09 2003 +0000

            Reviewed by John.
    
            - fixed 3392650 -- REGRESSION?: assertion fails trying Apple-hosted page load test while not on Apple network
    
            * WebView.subproj/WebFramePrivate.m: (-[WebFrame _isLoadComplete]):
            Stop loading the provisional data source before blowing it away, in case
            there are some callbacks that haven't occurred yet. It's a waste of time to
            try to handle those additional callbacks, and can lead to failed assertions
            since the data source won't be hooked up to any frame any more.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4887 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5111328..ff46a70 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2003-08-26  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - fixed 3392650 -- REGRESSION?: assertion fails trying Apple-hosted page load test while not on Apple network
+
+        * WebView.subproj/WebFramePrivate.m: (-[WebFrame _isLoadComplete]):
+        Stop loading the provisional data source before blowing it away, in case
+        there are some callbacks that haven't occurred yet. It's a waste of time to
+        try to handle those additional callbacks, and can lead to failed assertions
+        since the data source won't be hooked up to any frame any more.
+
 2003-08-25  Richard Williamson   <rjw at apple.com>
 
 	Fix for 3391609.  Our rounding hack wasn't correctly reflected in the selection point
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index f7c59d1..61caf44 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -937,6 +937,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
                                                                  forFrame:self];
 
                     // We know the provisional data source didn't cut the muster, release it.
+                    [_private->provisionalDataSource _stopLoading];
                     [self _setProvisionalDataSource:nil];
                     
                     [self _setState:WebFrameStateComplete];

-- 
WebKit Debian packaging