WebKit:

        Reviewed by Maciej.

        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=9452
          Assertion failure in -[WebFramePrivate setProvisionalDataSource:]

        * WebView/WebFrame.m:
        (-[WebFrame _checkLoadCompleteForThisFrame]): Avoid re-entering the delegate's
        -[webView:didFailProvisionalLoadWithError:forFrame].

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14910 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 753b2acb14fcf4e2dff381a834c98ba4faecc629..dcdc14de3e9b5b16cbdc546fe68e0a27e0a419f6 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2006-06-19  Mitz Pettel  <opendarwin.org@mitzpettel.com>
+
+        Reviewed by Maciej.
+
+        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=9452
+          Assertion failure in -[WebFramePrivate setProvisionalDataSource:]
+
+        * WebView/WebFrame.m:
+        (-[WebFrame _checkLoadCompleteForThisFrame]): Avoid re-entering the delegate's
+        -[webView:didFailProvisionalLoadWithError:forFrame].
+
 2006-06-18  Mitz Pettel  <opendarwin.org@mitzpettel.com>
 
         Reviewed by xenon.

diff --git a/WebKit/WebView/WebFrame.m b/WebKit/WebView/WebFrame.m
index 33a83509b353833f073a02ea32df03ffb466a335..849b945a1f5da3fa83c54dcd7b616efcdf89561c 100644 (file)
--- a/WebKit/WebView/WebFrame.m
+++ b/WebKit/WebView/WebFrame.m
@@ -1085,6 +1085,9 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     switch ([self _state]) {
         case WebFrameStateProvisional:
         {
+            if (_private->delegateIsHandlingProvisionalLoadError)
+                return;
+
             WebDataSource *pd = [self provisionalDataSource];
             
             LOG(Loading, "%@:  checking complete in WebFrameStateProvisional", [self name]);