<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[163132] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163132">163132</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-30 16:23:23 -0800 (Thu, 30 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a webView:didStartProvisionalNavigation: delegate method
https://bugs.webkit.org/show_bug.cgi?id=127965
Reviewed by Dan Bernstein.
Source/WebKit2:
* UIProcess/API/APILoaderClient.h:
(API::LoaderClient::didStartProvisionalLoadForFrame):
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageLoaderClient):
* UIProcess/API/Cocoa/WKNavigationDelegate.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
* UIProcess/Cocoa/NavigationState.h:
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::createLoaderClient):
(WebKit::NavigationState::createPolicyClient):
(WebKit::NavigationState::setNavigationDelegate):
(WebKit::NavigationState::LoaderClient::LoaderClient):
(WebKit::NavigationState::LoaderClient::~LoaderClient):
(WebKit::NavigationState::LoaderClient::didStartProvisionalLoadForFrame):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didStartProvisionalLoadForFrame):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDidStartProvisionalLoad):
Tools:
* TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm:
(-[NavigationDelegate webView:didStartProvisionalNavigation:]):
(TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPILoaderClienth">trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationDelegateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStateh">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStatemm">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaNavigationmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163131 => 163132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-30 23:58:30 UTC (rev 163131)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-31 00:23:23 UTC (rev 163132)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-01-30 Anders Carlsson <andersca@apple.com>
+
+ Add a webView:didStartProvisionalNavigation: delegate method
+ https://bugs.webkit.org/show_bug.cgi?id=127965
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/APILoaderClient.h:
+ (API::LoaderClient::didStartProvisionalLoadForFrame):
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageLoaderClient):
+ * UIProcess/API/Cocoa/WKNavigationDelegate.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ * UIProcess/Cocoa/NavigationState.h:
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::createLoaderClient):
+ (WebKit::NavigationState::createPolicyClient):
+ (WebKit::NavigationState::setNavigationDelegate):
+ (WebKit::NavigationState::LoaderClient::LoaderClient):
+ (WebKit::NavigationState::LoaderClient::~LoaderClient):
+ (WebKit::NavigationState::LoaderClient::didStartProvisionalLoadForFrame):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didStartProvisionalLoadForFrame):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidStartProvisionalLoad):
+
</ins><span class="cx"> 2014-01-30 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IDB: Implement IDBObjectStore.count()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPILoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h (163131 => 163132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-01-30 23:58:30 UTC (rev 163131)
+++ trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-01-31 00:23:23 UTC (rev 163132)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~LoaderClient() { }
</span><span class="cx">
</span><del>- virtual void didStartProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
</del><ins>+ virtual void didStartProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, uint64_t navigationID, API::Object*) { }
</ins><span class="cx"> virtual void didReceiveServerRedirectForProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
</span><span class="cx"> virtual void didFailProvisionalLoadWithErrorForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceError&, API::Object*) { }
</span><span class="cx"> virtual void didCommitLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (163131 => 163132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-01-30 23:58:30 UTC (rev 163131)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-01-31 00:23:23 UTC (rev 163132)
</span><span class="lines">@@ -692,7 +692,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual void didStartProvisionalLoadForFrame(WebPageProxy* page, WebFrameProxy* frame, API::Object* userData) override
</del><ins>+ virtual void didStartProvisionalLoadForFrame(WebPageProxy* page, WebFrameProxy* frame, uint64_t navigationID, API::Object* userData) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.didStartProvisionalLoadForFrame)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h (163131 => 163132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h 2014-01-30 23:58:30 UTC (rev 163131)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h 2014-01-31 00:23:23 UTC (rev 163132)
</span><span class="lines">@@ -51,6 +51,8 @@
</span><span class="cx"> - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationPolicyDecision))decisionHandler;
</span><span class="cx"> - (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicyDecision))decisionHandler;
</span><span class="cx">
</span><ins>+- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (163131 => 163132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-01-30 23:58:30 UTC (rev 163131)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-01-31 00:23:23 UTC (rev 163132)
</span><span class="lines">@@ -120,6 +120,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> _page->setPolicyClient(_navigationState->createPolicyClient());
</span><ins>+ _page->setLoaderClient(_navigationState->createLoaderClient());
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (163131 => 163132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-01-30 23:58:30 UTC (rev 163131)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-01-31 00:23:23 UTC (rev 163132)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx">
</span><span class="cx"> #import <wtf/HashMap.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import "APILoaderClient.h"
</ins><span class="cx"> #import "APIPolicyClient.h"
</span><span class="cx"> #import "WeakObjCPtr.h"
</span><span class="cx">
</span><span class="lines">@@ -47,6 +48,7 @@
</span><span class="cx"> ~NavigationState();
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<API::PolicyClient> createPolicyClient();
</span><ins>+ std::unique_ptr<API::LoaderClient> createLoaderClient();
</ins><span class="cx">
</span><span class="cx"> RetainPtr<id <WKNavigationDelegate> > navigationDelegate();
</span><span class="cx"> void setNavigationDelegate(id <WKNavigationDelegate>);
</span><span class="lines">@@ -68,9 +70,22 @@
</span><span class="cx"> NavigationState& m_navigationState;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ class LoaderClient : public API::LoaderClient {
+ public:
+ explicit LoaderClient(NavigationState&);
+ ~LoaderClient();
+
+ private:
+ virtual void didStartProvisionalLoadForFrame(WebPageProxy*, WebFrameProxy*, uint64_t navigationID, API::Object*) override;
+
+ NavigationState& m_navigationState;
+ };
+
</ins><span class="cx"> struct {
</span><span class="cx"> bool webViewDecidePolicyForNavigationActionDecisionHandler : 1;
</span><span class="cx"> bool webViewDecidePolicyForNavigationResponseDecisionHandler : 1;
</span><ins>+
+ bool webViewDidStartProvisionalNavigation : 1;
</ins><span class="cx"> } m_navigationDelegateMethods;
</span><span class="cx">
</span><span class="cx"> WKWebView *m_webView;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (163131 => 163132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-01-30 23:58:30 UTC (rev 163131)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-01-31 00:23:23 UTC (rev 163132)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #import "WKNavigationDelegate.h"
</span><span class="cx"> #import "WKNavigationInternal.h"
</span><ins>+#import "WebFrameProxy.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -42,6 +43,16 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+std::unique_ptr<API::LoaderClient> NavigationState::createLoaderClient()
+{
+ return std::make_unique<LoaderClient>(*this);
+}
+
+std::unique_ptr<API::PolicyClient> NavigationState::createPolicyClient()
+{
+ return std::make_unique<PolicyClient>(*this);
+}
+
</ins><span class="cx"> RetainPtr<id <WKNavigationDelegate> > NavigationState::navigationDelegate()
</span><span class="cx"> {
</span><span class="cx"> return m_navigationDelegate.get();
</span><span class="lines">@@ -53,6 +64,8 @@
</span><span class="cx">
</span><span class="cx"> m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionDecisionHandler = [delegate respondsToSelector:@selector(webView:decidePolicyForNavigationAction:decisionHandler:)];
</span><span class="cx"> m_navigationDelegateMethods.webViewDecidePolicyForNavigationResponseDecisionHandler = [delegate respondsToSelector:@selector(webView:decidePolicyForNavigationResponse:decisionHandler:)];
</span><ins>+
+ m_navigationDelegateMethods.webViewDidStartProvisionalNavigation = [delegate respondsToSelector:@selector(webView:didStartProvisionalNavigation:)];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RetainPtr<WKNavigation> NavigationState::createLoadRequestNavigation(uint64_t navigationID, NSURLRequest *request)
</span><span class="lines">@@ -68,11 +81,6 @@
</span><span class="cx"> return navigation;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<API::PolicyClient> NavigationState::createPolicyClient()
-{
- return std::make_unique<PolicyClient>(*this);
-}
-
</del><span class="cx"> NavigationState::PolicyClient::PolicyClient(NavigationState& navigationState)
</span><span class="cx"> : m_navigationState(navigationState)
</span><span class="cx"> {
</span><span class="lines">@@ -151,6 +159,35 @@
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+NavigationState::LoaderClient::LoaderClient(NavigationState& navigationState)
+ : m_navigationState(navigationState)
+{
+}
+
+NavigationState::LoaderClient::~LoaderClient()
+{
+}
+
+void NavigationState::LoaderClient::didStartProvisionalLoadForFrame(WebPageProxy*, WebFrameProxy* webFrameProxy, uint64_t navigationID, API::Object*)
+{
+ if (!webFrameProxy->isMainFrame())
+ return;
+
+ if (!m_navigationState.m_navigationDelegateMethods.webViewDidStartProvisionalNavigation)
+ 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.get() webView:m_navigationState.m_webView didStartProvisionalNavigation:navigation];
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (163131 => 163132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-30 23:58:30 UTC (rev 163131)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-31 00:23:23 UTC (rev 163132)
</span><span class="lines">@@ -2097,7 +2097,7 @@
</span><span class="cx"> m_loaderClient->didFinishProgress(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::didStartProvisionalLoadForFrame(uint64_t frameID, const String& url, const String& unreachableURL, IPC::MessageDecoder& decoder)
</del><ins>+void WebPageProxy::didStartProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& url, const String& unreachableURL, IPC::MessageDecoder& decoder)
</ins><span class="cx"> {
</span><span class="cx"> auto transaction = m_pageLoadState.transaction();
</span><span class="cx">
</span><span class="lines">@@ -2121,7 +2121,7 @@
</span><span class="cx"> frame->didStartProvisionalLoad(url);
</span><span class="cx">
</span><span class="cx"> m_pageLoadState.commitChanges();
</span><del>- m_loaderClient->didStartProvisionalLoadForFrame(this, frame, userData.get());
</del><ins>+ m_loaderClient->didStartProvisionalLoadForFrame(this, frame, navigationID, userData.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, const String& url, IPC::MessageDecoder& decoder)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (163131 => 163132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-01-30 23:58:30 UTC (rev 163131)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-01-31 00:23:23 UTC (rev 163132)
</span><span class="lines">@@ -897,7 +897,7 @@
</span><span class="cx"> void didCreateMainFrame(uint64_t frameID);
</span><span class="cx"> void didCreateSubframe(uint64_t frameID);
</span><span class="cx">
</span><del>- void didStartProvisionalLoadForFrame(uint64_t frameID, const String& url, const String& unreachableURL, IPC::MessageDecoder&);
</del><ins>+ void didStartProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& url, const String& unreachableURL, IPC::MessageDecoder&);
</ins><span class="cx"> void didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, const String&, IPC::MessageDecoder&);
</span><span class="cx"> void didFailProvisionalLoadForFrame(uint64_t frameID, const WebCore::ResourceError&, IPC::MessageDecoder&);
</span><span class="cx"> void didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t frameLoadType, const WebCore::CertificateInfo&, IPC::MessageDecoder&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (163131 => 163132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-01-30 23:58:30 UTC (rev 163131)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-01-31 00:23:23 UTC (rev 163132)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> DidLayout(uint32_t type, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
</span><span class="cx"> DidReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, String url, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
</span><span class="cx"> DidRemoveFrameFromHierarchy(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
</span><del>- DidStartProvisionalLoadForFrame(uint64_t frameID, String url, String unreachableURL, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
</del><ins>+ DidStartProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, String url, String unreachableURL, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
</ins><span class="cx"> DidReceiveTitleForFrame(uint64_t frameID, String title, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
</span><span class="cx"> DidDisplayInsecureContentForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
</span><span class="cx"> DidRunInsecureContentForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (163131 => 163132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-01-30 23:58:30 UTC (rev 163131)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-01-31 00:23:23 UTC (rev 163132)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include "WebBackForwardListProxy.h"
</span><span class="cx"> #include "WebContextMessages.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><ins>+#include "WebDocumentLoader.h"
</ins><span class="cx"> #include "WebErrors.h"
</span><span class="cx"> #include "WebEvent.h"
</span><span class="cx"> #include "WebFrame.h"
</span><span class="lines">@@ -394,17 +395,17 @@
</span><span class="cx"> webPage->findController().hideFindUI();
</span><span class="cx"> webPage->sandboxExtensionTracker().didStartProvisionalLoad(m_frame);
</span><span class="cx">
</span><del>- DocumentLoader* provisionalLoader = m_frame->coreFrame()->loader().provisionalDocumentLoader();
- const String& url = provisionalLoader->url().string();
</del><ins>+ WebDocumentLoader& provisionalLoader = static_cast<WebDocumentLoader&>(*m_frame->coreFrame()->loader().provisionalDocumentLoader());
+ const String& url = provisionalLoader.url().string();
</ins><span class="cx"> RefPtr<API::Object> userData;
</span><span class="cx">
</span><span class="cx"> // Notify the bundle client.
</span><span class="cx"> webPage->injectedBundleLoaderClient().didStartProvisionalLoadForFrame(webPage, m_frame, userData);
</span><span class="cx">
</span><del>- String unreachableURL = provisionalLoader->unreachableURL().string();
</del><ins>+ String unreachableURL = provisionalLoader.unreachableURL().string();
</ins><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><del>- webPage->send(Messages::WebPageProxy::DidStartProvisionalLoadForFrame(m_frame->frameID(), url, unreachableURL, InjectedBundleUserMessageEncoder(userData.get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidStartProvisionalLoadForFrame(m_frame->frameID(), provisionalLoader.navigationID(), url, unreachableURL, InjectedBundleUserMessageEncoder(userData.get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::dispatchDidReceiveTitle(const StringWithDirection& title)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (163131 => 163132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-30 23:58:30 UTC (rev 163131)
+++ trunk/Tools/ChangeLog 2014-01-31 00:23:23 UTC (rev 163132)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-30 Anders Carlsson <andersca@apple.com>
+
+ Add a webView:didStartProvisionalNavigation: delegate method
+ https://bugs.webkit.org/show_bug.cgi?id=127965
+
+ Reviewed by Dan Bernstein.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm:
+ (-[NavigationDelegate webView:didStartProvisionalNavigation:]):
+ (TEST):
+
</ins><span class="cx"> 2014-01-30 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKitTestRunner fails to link - missing rowHeaders and columnHeaders
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaNavigationmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm (163131 => 163132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm 2014-01-30 23:58:30 UTC (rev 163131)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm 2014-01-31 00:23:23 UTC (rev 163132)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #import <WebKit2/WKNavigationDelegate.h>
</span><span class="cx"> #import <WebKit2/WKWebView.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import "PlatformUtilities.h"
</ins><span class="cx"> #import "Test.h"
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="lines">@@ -36,7 +37,19 @@
</span><span class="cx"> @interface NavigationDelegate : NSObject <WKNavigationDelegate>
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+static bool isDone;
+static RetainPtr<WKNavigation> currentNavigation;
+
</ins><span class="cx"> @implementation NavigationDelegate
</span><ins>+
+- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation
+{
+ EXPECT_EQ(currentNavigation, navigation);
+ EXPECT_NOT_NULL(navigation.request);
+
+ isDone = true;
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> TEST(WKNavigation, NavigationDelegate)
</span><span class="lines">@@ -58,11 +71,16 @@
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
</span><span class="cx">
</span><ins>+ RetainPtr<NavigationDelegate> delegate = adoptNS([[NavigationDelegate alloc] init]);
+ [webView setNavigationDelegate:delegate.get()];
+
</ins><span class="cx"> NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"simple" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
</span><span class="cx">
</span><del>- WKNavigation *navigation = [webView loadRequest:request];
- ASSERT_NOT_NULL(navigation);
- ASSERT_TRUE([navigation.request isEqual:request]);
</del><ins>+ currentNavigation = [webView loadRequest:request];
+ ASSERT_NOT_NULL(currentNavigation);
+ ASSERT_TRUE([[currentNavigation request] isEqual:request]);
+
+ TestWebKitAPI::Util::run(&isDone);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>