Diff
Modified: trunk/Source/WebKit2/ChangeLog (163200 => 163201)
--- trunk/Source/WebKit2/ChangeLog 2014-01-31 22:18:08 UTC (rev 163200)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-31 22:21:27 UTC (rev 163201)
@@ -1,3 +1,28 @@
+2014-01-31 Anders Carlsson <[email protected]>
+
+ Add webView:didReceiveServerRedirectForProvisionalNavigation:
+ https://bugs.webkit.org/show_bug.cgi?id=128016
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/APILoaderClient.h:
+ (API::LoaderClient::didReceiveServerRedirectForProvisionalLoadForFrame):
+ * 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::didReceiveServerRedirectForProvisionalLoadForFrame):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad):
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+
2014-01-31 Brady Eidson <[email protected]>
IDB: Index cursor preliminary support
Modified: trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h (163200 => 163201)
--- trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-01-31 22:18:08 UTC (rev 163200)
+++ trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-01-31 22:21:27 UTC (rev 163201)
@@ -54,7 +54,7 @@
virtual ~LoaderClient() { }
virtual void didStartProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, uint64_t navigationID, API::Object*) { }
- virtual void didReceiveServerRedirectForProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
+ virtual void didReceiveServerRedirectForProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, uint64_t navigationID, API::Object*) { }
virtual void didFailProvisionalLoadWithErrorForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, uint64_t navigationID, const WebCore::ResourceError&, API::Object*) { }
virtual void didCommitLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, uint64_t navigationID, API::Object*) { }
virtual void didFinishDocumentLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (163200 => 163201)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-01-31 22:18:08 UTC (rev 163200)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-01-31 22:21:27 UTC (rev 163201)
@@ -700,7 +700,7 @@
m_client.didStartProvisionalLoadForFrame(toAPI(page), toAPI(frame), toAPI(userData), m_client.base.clientInfo);
}
- virtual void didReceiveServerRedirectForProvisionalLoadForFrame(WebPageProxy* page, WebFrameProxy* frame, API::Object* userData) override
+ virtual void didReceiveServerRedirectForProvisionalLoadForFrame(WebPageProxy* page, WebFrameProxy* frame, uint64_t navigationID, API::Object* userData) override
{
if (!m_client.didReceiveServerRedirectForProvisionalLoadForFrame)
return;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h (163200 => 163201)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h 2014-01-31 22:18:08 UTC (rev 163200)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h 2014-01-31 22:21:27 UTC (rev 163201)
@@ -52,6 +52,8 @@
- (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicyDecision))decisionHandler;
- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation;
+- (void)webView:(WKWebView *)webView didReceiveServerRedirectForProvisionalNavigation:(WKNavigation *)navigation;
+
- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error;
- (void)webView:(WKWebView *)webView didCommitNavigation:(WKNavigation *)navigation;
- (void)webView:(WKWebView *)webView didFinishLoadingNavigation:(WKNavigation *)navigation;
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (163200 => 163201)
--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-01-31 22:18:08 UTC (rev 163200)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-01-31 22:21:27 UTC (rev 163201)
@@ -77,6 +77,7 @@
private:
virtual void didStartProvisionalLoadForFrame(WebPageProxy*, WebFrameProxy*, uint64_t navigationID, API::Object*) override;
+ virtual void didReceiveServerRedirectForProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, uint64_t navigationID, API::Object*);
virtual void didFailProvisionalLoadWithErrorForFrame(WebPageProxy*, WebFrameProxy*, uint64_t navigationID, const WebCore::ResourceError&, API::Object*) override;
virtual void didCommitLoadForFrame(WebPageProxy*, WebFrameProxy*, uint64_t navigationID, API::Object*) override;
virtual void didFinishLoadForFrame(WebPageProxy*, WebFrameProxy*, uint64_t navigationID, API::Object*) override;
@@ -89,6 +90,7 @@
bool webViewDecidePolicyForNavigationResponseDecisionHandler : 1;
bool webViewDidStartProvisionalNavigation : 1;
+ bool webViewDidReceiveServerRedirectForProvisionalNavigation : 1;
bool webViewDidFailProvisionalNavigationWithError : 1;
bool webViewDidCommitNavigation : 1;
bool webViewDidFinishLoadingNavigation : 1;
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (163200 => 163201)
--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-01-31 22:18:08 UTC (rev 163200)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-01-31 22:21:27 UTC (rev 163201)
@@ -66,6 +66,7 @@
m_navigationDelegateMethods.webViewDecidePolicyForNavigationResponseDecisionHandler = [delegate respondsToSelector:@selector(webView:decidePolicyForNavigationResponse:decisionHandler:)];
m_navigationDelegateMethods.webViewDidStartProvisionalNavigation = [delegate respondsToSelector:@selector(webView:didStartProvisionalNavigation:)];
+ m_navigationDelegateMethods.webViewDidReceiveServerRedirectForProvisionalNavigation = [delegate respondsToSelector:@selector(webView:didReceiveServerRedirectForProvisionalNavigation:)];
m_navigationDelegateMethods.webViewDidFailProvisionalNavigationWithError = [delegate respondsToSelector:@selector(webView:didFailProvisionalNavigation:withError:)];
m_navigationDelegateMethods.webViewDidCommitNavigation = [delegate respondsToSelector:@selector(webView:didCommitNavigation:)];
m_navigationDelegateMethods.webViewDidFinishLoadingNavigation = [delegate respondsToSelector:@selector(webView:didFinishLoadingNavigation:)];
@@ -191,6 +192,26 @@
[navigationDelegate webView:m_navigationState.m_webView didStartProvisionalNavigation:navigation];
}
+void NavigationState::LoaderClient::didReceiveServerRedirectForProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy* webFrameProxy, uint64_t navigationID, API::Object*)
+{
+ if (!webFrameProxy->isMainFrame())
+ return;
+
+ if (!m_navigationState.m_navigationDelegateMethods.webViewDidReceiveServerRedirectForProvisionalNavigation)
+ return;
+
+ auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
+ if (!navigationDelegate)
+ return;
+
+ // FIXME: We should assert that navigationID is not zero here, but it's currently zero for navigations originating from the web process.
+ WKNavigation *navigation = nil;
+ if (navigationID)
+ navigation = m_navigationState.m_navigations.get(navigationID).get();
+
+ [navigationDelegate webView:m_navigationState.m_webView didReceiveServerRedirectForProvisionalNavigation:navigation];
+}
+
void NavigationState::LoaderClient::didFailProvisionalLoadWithErrorForFrame(WebPageProxy*, WebFrameProxy* webFrameProxy, uint64_t navigationID, const WebCore::ResourceError& error, API::Object*)
{
if (!webFrameProxy->isMainFrame())
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (163200 => 163201)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-31 22:18:08 UTC (rev 163200)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-31 22:21:27 UTC (rev 163201)
@@ -2123,7 +2123,7 @@
m_loaderClient->didStartProvisionalLoadForFrame(this, frame, navigationID, userData.get());
}
-void WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, const String& url, IPC::MessageDecoder& decoder)
+void WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& url, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2142,7 +2142,7 @@
frame->didReceiveServerRedirectForProvisionalLoad(url);
m_pageLoadState.commitChanges();
- m_loaderClient->didReceiveServerRedirectForProvisionalLoadForFrame(this, frame, userData.get());
+ m_loaderClient->didReceiveServerRedirectForProvisionalLoadForFrame(this, frame, navigationID, userData.get());
}
void WebPageProxy::didFailProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const ResourceError& error, IPC::MessageDecoder& decoder)
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (163200 => 163201)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-01-31 22:18:08 UTC (rev 163200)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-01-31 22:21:27 UTC (rev 163201)
@@ -898,7 +898,7 @@
void didCreateSubframe(uint64_t frameID);
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 didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String&, IPC::MessageDecoder&);
void didFailProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const WebCore::ResourceError&, IPC::MessageDecoder&);
void didCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& mimeType, uint32_t frameLoadType, const WebCore::CertificateInfo&, IPC::MessageDecoder&);
void didFinishDocumentLoadForFrame(uint64_t frameID, IPC::MessageDecoder&);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (163200 => 163201)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-01-31 22:18:08 UTC (rev 163200)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-01-31 22:21:27 UTC (rev 163201)
@@ -121,7 +121,7 @@
# 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
+ DidReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, String url, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidFailProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, String mimeType, uint32_t loadType, WebCore::CertificateInfo certificateInfo, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidFailLoadForFrame(uint64_t frameID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (163200 => 163201)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-01-31 22:18:08 UTC (rev 163200)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-01-31 22:21:27 UTC (rev 163201)
@@ -279,15 +279,15 @@
if (!webPage)
return;
- DocumentLoader* provisionalLoader = m_frame->coreFrame()->loader().provisionalDocumentLoader();
- const String& url = ""
+ WebDocumentLoader& documentLoader = static_cast<WebDocumentLoader&>(*m_frame->coreFrame()->loader().provisionalDocumentLoader());
+ const String& url = ""
RefPtr<API::Object> userData;
// Notify the bundle client.
webPage->injectedBundleLoaderClient().didReceiveServerRedirectForProvisionalLoadForFrame(webPage, m_frame, userData);
// Notify the UIProcess.
- webPage->send(Messages::WebPageProxy::DidReceiveServerRedirectForProvisionalLoadForFrame(m_frame->frameID(), url, InjectedBundleUserMessageEncoder(userData.get())));
+ webPage->send(Messages::WebPageProxy::DidReceiveServerRedirectForProvisionalLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), url, InjectedBundleUserMessageEncoder(userData.get())));
}
void WebFrameLoaderClient::dispatchDidCancelClientRedirect()
