Diff
Modified: trunk/Source/WebKit2/ChangeLog (163136 => 163137)
--- trunk/Source/WebKit2/ChangeLog 2014-01-31 01:07:16 UTC (rev 163136)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-31 01:08:54 UTC (rev 163137)
@@ -1,5 +1,28 @@
2014-01-30 Anders Carlsson <[email protected]>
+ Add a webView:didFailProvisionalNavigation:withError: delegate method
+ https://bugs.webkit.org/show_bug.cgi?id=127968
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/APILoaderClient.h:
+ (API::LoaderClient::didFailProvisionalLoadWithErrorForFrame):
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageLoaderClient):
+ * UIProcess/API/Cocoa/WKNavigationDelegate.h:
+ * UIProcess/Cocoa/NavigationState.h:
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::setNavigationDelegate):
+ (WebKit::NavigationState::LoaderClient::didFailProvisionalLoadWithErrorForFrame):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didFailProvisionalLoadForFrame):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidFailProvisionalLoad):
+
+2014-01-30 Anders Carlsson <[email protected]>
+
Add a webView:didStartProvisionalNavigation: delegate method
https://bugs.webkit.org/show_bug.cgi?id=127965
Modified: trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h (163136 => 163137)
--- trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-01-31 01:07:16 UTC (rev 163136)
+++ trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-01-31 01:08:54 UTC (rev 163137)
@@ -55,7 +55,7 @@
virtual void didStartProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, uint64_t navigationID, API::Object*) { }
virtual void didReceiveServerRedirectForProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
- virtual void didFailProvisionalLoadWithErrorForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceError&, API::Object*) { }
+ virtual void didFailProvisionalLoadWithErrorForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, uint64_t navigationID, const WebCore::ResourceError&, API::Object*) { }
virtual void didCommitLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
virtual void didFinishDocumentLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
virtual void didFinishLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (163136 => 163137)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-01-31 01:07:16 UTC (rev 163136)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-01-31 01:08:54 UTC (rev 163137)
@@ -708,7 +708,7 @@
m_client.didReceiveServerRedirectForProvisionalLoadForFrame(toAPI(page), toAPI(frame), toAPI(userData), m_client.base.clientInfo);
}
- virtual void didFailProvisionalLoadWithErrorForFrame(WebPageProxy* page, WebFrameProxy* frame, const ResourceError& error, API::Object* userData) override
+ virtual void didFailProvisionalLoadWithErrorForFrame(WebPageProxy* page, WebFrameProxy* frame, uint64_t navigationID, const ResourceError& error, API::Object* userData) override
{
if (!m_client.didFailProvisionalLoadWithErrorForFrame)
return;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h (163136 => 163137)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h 2014-01-31 01:07:16 UTC (rev 163136)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h 2014-01-31 01:08:54 UTC (rev 163137)
@@ -52,6 +52,7 @@
- (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicyDecision))decisionHandler;
- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation;
+- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error;
@end
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (163136 => 163137)
--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-01-31 01:07:16 UTC (rev 163136)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-01-31 01:08:54 UTC (rev 163137)
@@ -77,6 +77,7 @@
private:
virtual void didStartProvisionalLoadForFrame(WebPageProxy*, WebFrameProxy*, uint64_t navigationID, API::Object*) override;
+ virtual void didFailProvisionalLoadWithErrorForFrame(WebPageProxy*, WebFrameProxy*, uint64_t navigationID, const WebCore::ResourceError&, API::Object*) override;
NavigationState& m_navigationState;
};
@@ -86,6 +87,7 @@
bool webViewDecidePolicyForNavigationResponseDecisionHandler : 1;
bool webViewDidStartProvisionalNavigation : 1;
+ bool webViewDidFailProvisionalNavigationWithError : 1;
} m_navigationDelegateMethods;
WKWebView *m_webView;
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (163136 => 163137)
--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-01-31 01:07:16 UTC (rev 163136)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-01-31 01:08:54 UTC (rev 163137)
@@ -66,6 +66,7 @@
m_navigationDelegateMethods.webViewDecidePolicyForNavigationResponseDecisionHandler = [delegate respondsToSelector:@selector(webView:decidePolicyForNavigationResponse:decisionHandler:)];
m_navigationDelegateMethods.webViewDidStartProvisionalNavigation = [delegate respondsToSelector:@selector(webView:didStartProvisionalNavigation:)];
+ m_navigationDelegateMethods.webViewDidFailProvisionalNavigationWithError = [delegate respondsToSelector:@selector(webView:didFailProvisionalNavigation:withError:)];
}
RetainPtr<WKNavigation> NavigationState::createLoadRequestNavigation(uint64_t navigationID, NSURLRequest *request)
@@ -188,6 +189,28 @@
[navigationDelegate.get() webView:m_navigationState.m_webView didStartProvisionalNavigation:navigation];
}
+void NavigationState::LoaderClient::didFailProvisionalLoadWithErrorForFrame(WebPageProxy*, WebFrameProxy* webFrameProxy, uint64_t navigationID, const WebCore::ResourceError& error, API::Object*)
+{
+ if (!webFrameProxy->isMainFrame())
+ return;
+
+ // FIXME: We should assert that navigationID is not zero here, but it's currently zero for navigations originating from the web process.
+ RetainPtr<WKNavigation> navigation;
+ if (navigationID)
+ navigation = m_navigationState.m_navigations.take(navigationID);
+
+ // FIXME: Set the error on the navigation object.
+
+ if (!m_navigationState.m_navigationDelegateMethods.webViewDidFailProvisionalNavigationWithError)
+ return;
+
+ auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
+ if (!navigationDelegate)
+ return;
+
+ [navigationDelegate.get() webView:m_navigationState.m_webView didFailProvisionalNavigation:navigation.get() withError:error];
+}
+
} // namespace WebKit
#endif
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (163136 => 163137)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-31 01:07:16 UTC (rev 163136)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-31 01:08:54 UTC (rev 163137)
@@ -2146,7 +2146,7 @@
m_loaderClient->didReceiveServerRedirectForProvisionalLoadForFrame(this, frame, userData.get());
}
-void WebPageProxy::didFailProvisionalLoadForFrame(uint64_t frameID, const ResourceError& error, IPC::MessageDecoder& decoder)
+void WebPageProxy::didFailProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const ResourceError& error, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2164,7 +2164,7 @@
frame->didFailProvisionalLoad();
m_pageLoadState.commitChanges();
- m_loaderClient->didFailProvisionalLoadWithErrorForFrame(this, frame, error, userData.get());
+ m_loaderClient->didFailProvisionalLoadWithErrorForFrame(this, frame, navigationID, error, userData.get());
}
void WebPageProxy::clearLoadDependentCallbacks()
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (163136 => 163137)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-01-31 01:07:16 UTC (rev 163136)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-01-31 01:08:54 UTC (rev 163137)
@@ -899,7 +899,7 @@
void didStartProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& url, const String& unreachableURL, IPC::MessageDecoder&);
void didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, const String&, IPC::MessageDecoder&);
- void didFailProvisionalLoadForFrame(uint64_t frameID, const WebCore::ResourceError&, IPC::MessageDecoder&);
+ void didFailProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const WebCore::ResourceError&, IPC::MessageDecoder&);
void didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t frameLoadType, const WebCore::CertificateInfo&, IPC::MessageDecoder&);
void didFinishDocumentLoadForFrame(uint64_t frameID, IPC::MessageDecoder&);
void didFinishLoadForFrame(uint64_t frameID, IPC::MessageDecoder&);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (163136 => 163137)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-01-31 01:07:16 UTC (rev 163136)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-01-31 01:08:54 UTC (rev 163137)
@@ -120,17 +120,17 @@
DidCreateSubframe(uint64_t frameID)
# Frame load messages
+ DidStartProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, String url, String unreachableURL, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
+ DidReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, String url, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
+ DidFailProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidCommitLoadForFrame(uint64_t frameID, String mimeType, uint32_t loadType, WebCore::CertificateInfo certificateInfo, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidFailLoadForFrame(uint64_t frameID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
- DidFailProvisionalLoadForFrame(uint64_t frameID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidFinishDocumentLoadForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidFinishLoadForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidFirstLayoutForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidLayout(uint32_t type, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
- DidReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, String url, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidRemoveFrameFromHierarchy(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
- DidStartProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, String url, String unreachableURL, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidReceiveTitleForFrame(uint64_t frameID, String title, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidDisplayInsecureContentForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidRunInsecureContentForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (163136 => 163137)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-01-31 01:07:16 UTC (rev 163136)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-01-31 01:08:54 UTC (rev 163137)
@@ -464,7 +464,8 @@
webPage->sandboxExtensionTracker().didFailProvisionalLoad(m_frame);
// Notify the UIProcess.
- webPage->send(Messages::WebPageProxy::DidFailProvisionalLoadForFrame(m_frame->frameID(), error, InjectedBundleUserMessageEncoder(userData.get())));
+ WebDocumentLoader& provisionalLoader = static_cast<WebDocumentLoader&>(*m_frame->coreFrame()->loader().provisionalDocumentLoader());
+ webPage->send(Messages::WebPageProxy::DidFailProvisionalLoadForFrame(m_frame->frameID(), provisionalLoader.navigationID(), error, InjectedBundleUserMessageEncoder(userData.get())));
// If we have a load listener, notify it.
if (WebFrame::LoadListener* loadListener = m_frame->loadListener())
Modified: trunk/Tools/ChangeLog (163136 => 163137)
--- trunk/Tools/ChangeLog 2014-01-31 01:07:16 UTC (rev 163136)
+++ trunk/Tools/ChangeLog 2014-01-31 01:08:54 UTC (rev 163137)
@@ -1,3 +1,15 @@
+2014-01-30 Anders Carlsson <[email protected]>
+
+ Add a webView:didFailProvisionalNavigation:withError: delegate method
+ https://bugs.webkit.org/show_bug.cgi?id=127968
+
+ Reviewed by Dan Bernstein.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm:
+ (-[DidFailProvisionalNavigationDelegate webView:didStartProvisionalNavigation:]):
+ (-[DidFailProvisionalNavigationDelegate webView:didFailProvisionalNavigation:withError:]):
+ (TEST):
+
2014-01-30 Ryosuke Niwa <[email protected]>
The test server build fixes.
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm (163136 => 163137)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm 2014-01-31 01:07:16 UTC (rev 163136)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm 2014-01-31 01:08:54 UTC (rev 163137)
@@ -34,12 +34,12 @@
#if WK_API_ENABLED
+static bool isDone;
+static RetainPtr<WKNavigation> currentNavigation;
+
@interface NavigationDelegate : NSObject <WKNavigationDelegate>
@end
-static bool isDone;
-static RetainPtr<WKNavigation> currentNavigation;
-
@implementation NavigationDelegate
- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation
@@ -83,4 +83,44 @@
TestWebKitAPI::Util::run(&isDone);
}
+@interface DidFailProvisionalNavigationDelegate : NSObject <WKNavigationDelegate>
+@end
+
+@implementation DidFailProvisionalNavigationDelegate
+
+- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation
+{
+ EXPECT_EQ(currentNavigation, navigation);
+ EXPECT_NOT_NULL(navigation.request);
+}
+
+- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error
+{
+ EXPECT_EQ(currentNavigation, navigation);
+ EXPECT_NOT_NULL(navigation.request);
+
+ EXPECT_TRUE([error.domain isEqualToString:NSURLErrorDomain]);
+ EXPECT_EQ(NSURLErrorUnsupportedURL, error.code);
+
+ isDone = true;
+}
+
+@end
+
+TEST(WKNavigation, DidFailProvisionalNavigation)
+{
+ RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
+
+ RetainPtr<DidFailProvisionalNavigationDelegate> delegate = adoptNS([[DidFailProvisionalNavigationDelegate alloc] init]);
+ [webView setNavigationDelegate:delegate.get()];
+
+ NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"non-existant-scheme://"]];
+
+ currentNavigation = [webView loadRequest:request];
+ ASSERT_NOT_NULL(currentNavigation);
+ ASSERT_TRUE([[currentNavigation request] isEqual:request]);
+
+ TestWebKitAPI::Util::run(&isDone);
+}
+
#endif
