Changeset 169460 in webkit

Timestamp:

May 29, 2014, 1:01:27 PM (11 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] Can’t recover from subframe load errors
​https://bugs.webkit.org/show_bug.cgi?id=133385

Reviewed by Anders Carlsson.

• UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h: Declared new delegate method.
• UIProcess/Cocoa/NavigationState.h: Added flag in m_navigationDelegateMethods struct.
• UIProcess/Cocoa/NavigationState.mm:

(WebKit::NavigationState::setNavigationDelegate): Initialize
webViewNavigationDidFailProvisionalLoadInSubframeWithError flag in the delegate methods
struct.
(WebKit::NavigationState::LoaderClient::didFailProvisionalLoadWithErrorForFrame): If the
error occurred in a subframe, invoke the new delegate method.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h (modified) (2 diffs)
• UIProcess/Cocoa/NavigationState.h (modified) (1 diff)
• UIProcess/Cocoa/NavigationState.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-05-29  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Can’t recover from subframe load errors
+        https://bugs.webkit.org/show_bug.cgi?id=133385
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h: Declared new delegate method.
+        * UIProcess/Cocoa/NavigationState.h: Added flag in m_navigationDelegateMethods struct.
+        * UIProcess/Cocoa/NavigationState.mm:
+        (WebKit::NavigationState::setNavigationDelegate): Initialize
+        webViewNavigationDidFailProvisionalLoadInSubframeWithError flag in the delegate methods
+        struct.
+        (WebKit::NavigationState::LoaderClient::didFailProvisionalLoadWithErrorForFrame): If the
+        error occurred in a subframe, invoke the new delegate method.
+
 2014-05-29  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h

@@ -25 +25 @@
 
 #import <WebKit/WKNavigationDelegate.h>
+
+#import <WebKit/WKFrameInfo.h>
 #import <WebKit/WKWebViewPrivate.h>
 
@@ -36 +38 @@
 
 @optional
+
+- (void)_webView:(WKWebView *)webView navigation:(WKNavigation *)navigation didFailProvisionalLoadInSubframe:(WKFrameInfo *)subframe withError:(NSError *)error;
 
 - (void)_webView:(WKWebView *)webView navigationDidFinishDocumentLoad:(WKNavigation *)navigation;

trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h

@@ -138 +138 @@
         bool webViewDidReceiveServerRedirectForProvisionalNavigation : 1;
         bool webViewDidFailProvisionalNavigationWithError : 1;
+        bool webViewNavigationDidFailProvisionalLoadInSubframeWithError : 1;
         bool webViewDidCommitNavigation : 1;
         bool webViewNavigationDidFinishDocumentLoad : 1;

trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm

@@ -124 +124 @@
     m_navigationDelegateMethods.webViewDidFailNavigationWithError = [delegate respondsToSelector:@selector(webView:didFailNavigation:withError:)];
 
+    m_navigationDelegateMethods.webViewNavigationDidFailProvisionalLoadInSubframeWithError = [delegate respondsToSelector:@selector(_webView:navigation:didFailProvisionalLoadInSubframe:withError:)];
     m_navigationDelegateMethods.webViewNavigationDidFinishDocumentLoad = [delegate respondsToSelector:@selector(_webView:navigationDidFinishDocumentLoad:)];
     m_navigationDelegateMethods.webViewRenderingProgressDidChange = [delegate respondsToSelector:@selector(_webView:renderingProgressDidChange:)];
@@ -432 +433 @@
 void NavigationState::LoaderClient::didFailProvisionalLoadWithErrorForFrame(WebPageProxy*, WebFrameProxy* webFrameProxy, uint64_t navigationID, const WebCore::ResourceError& error, API::Object*)
 {
-    if (!webFrameProxy->isMainFrame())
-        return;
+    if (!webFrameProxy->isMainFrame()) {
+        if (!m_navigationState.m_navigationDelegateMethods.webViewNavigationDidFailProvisionalLoadInSubframeWithError)
+            return;
+
+        auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
+        auto errorWithRecoveryAttempter = createErrorWithRecoveryAttempter(m_navigationState.m_webView, *webFrameProxy, error);
+        // FIXME: Get the main frame's current navigation.
+        [(id <WKNavigationDelegatePrivate>)navigationDelegate _webView:m_navigationState.m_webView navigation:nil didFailProvisionalLoadInSubframe:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*webFrameProxy]).get() withError:errorWithRecoveryAttempter.get()];
+
+        return;
+    }
 
     // FIXME: We should assert that navigationID is not zero here, but it's currently zero for navigations originating from the web process.