<!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>[170660] trunk/Source/WebKit2</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/170660">170660</a></dd>

<dt>Author</dt> <dd>mitz@apple.com</dd>

<dt>Date</dt> <dd>2014-07-01 13:22:58 -0700 (Tue, 01 Jul 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>[Cocoa] Navigation parameter in navigation delegate messages is nil for navigations started by the Web Content process

https://bugs.webkit.org/show_bug.cgi?id=134482

Reviewed by Tim Horton.

* UIProcess/API/APILoaderClient.h:

(API::LoaderClient::didDestroyNavigation): New client function, called when a navigation ID

is not going to be used anymore.

* UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _restoreFromSessionState:]): If restoring triggered a navigation, create a

WKNavigation for its ID.

* UIProcess/Cocoa/NavigationState.h:

* UIProcess/Cocoa/NavigationState.mm:

(WebKit::NavigationState::createLoadRequestNavigation): Removed FIXME, because we now remove

navigations from the map in LoaderClient::didDestroyNavigation.

(WebKit::NavigationState::createBackForwardNavigation): Ditto.

(WebKit::NavigationState::createReloadNavigation): Ditto.

(WebKit::NavigationState::createLoadDataNavigation): Ditto.

(WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction): If we are only

getting a navigation ID now, create a WKNavigation for it. Also changed to create the

NSURLRequest lazily.

(WebKit::NavigationState::LoaderClient::didStartProvisionalLoadForFrame): Assert that

navigationID is not zero and that it maps to an existing WKNavigation.

(WebKit::NavigationState::LoaderClient::didReceiveServerRedirectForProvisionalLoadForFrame):

Ditto.

(WebKit::NavigationState::LoaderClient::didFailProvisionalLoadWithErrorForFrame): Ditto.

(WebKit::NavigationState::LoaderClient::didCommitLoadForFrame): Ditto.

(WebKit::NavigationState::LoaderClient::didFinishDocumentLoadForFrame): Ditto.

(WebKit::NavigationState::LoaderClient::didFinishLoadForFrame): Ditto.

(WebKit::NavigationState::LoaderClient::didFailLoadWithErrorForFrame): Ditto.

(WebKit::NavigationState::LoaderClient::didDestroyNavigation): Override the new client

function to remove the navigation from the map.

(WebKit::NavigationState::LoaderClient::processDidCrash): Clear the navigations map.

* UIProcess/WebFrameListenerProxy.cpp:

(WebKit::WebFrameListenerProxy::WebFrameListenerProxy): Initialize new m_navigationID

member variable.

(WebKit::WebFrameListenerProxy::receivedPolicyDecision): Pass the navigation ID to

WebFrame::receivedPolicyDecision.

* UIProcess/WebFrameListenerProxy.h:

(WebKit::WebFrameListenerProxy::navigationID): Added this accessor.

(WebKit::WebFrameListenerProxy::setNavigationID): Ditto.

* UIProcess/WebFrameProxy.cpp:

(WebKit::WebFrameProxy::receivedPolicyDecision): Added navigationID parameter, which is

passed along to the WebPageProxy.

* UIProcess/WebFrameProxy.h:

* UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::receivedPolicyDecision): Added navigationID parameter, which is

passed along in the message to the Web Content process.

(WebKit::WebPageProxy::restoreFromSessionStateData): Changed to return a navigation ID of 0.

(WebKit::WebPageProxy::restoreFromState): Changed to return a navigation ID if one was

started.

(WebKit::WebPageProxy::didDestroyNavigation): Added. Calls the new client function.

(WebKit::WebPageProxy::decidePolicyForNavigationAction): Added navigationID and

newNavigationID parameters. If a main-frame navigation doesn’t already have an ID, assign it

a new ID and return it in the newNavigationID parmeter as well as setting it on the listener

for the asynchronous case.

* UIProcess/WebPageProxy.h:

* UIProcess/WebPageProxy.messages.in: Added navigationID and newNavigationID parameters.

* UIProcess/cf/WebPageProxyCF.cpp:

(WebKit::WebPageProxy::restoreFromSessionStateData): Changed to return a navigation ID if

one was started.

* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse): Updated for additional

parameter.

(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Send the navigation

ID to the UI process, get the new navigation ID from the reply, and set it on the document

loader.

* WebProcess/WebPage/WebDocumentLoader.cpp:

(WebKit::WebDocumentLoader::detachFromFrame): Override to let the UI process know that the

navigation ID will not be used anymore.

* WebProcess/WebPage/WebDocumentLoader.h:

* WebProcess/WebPage/WebFrame.cpp:

(WebKit::WebFrame::didReceivePolicyDecision): Added navigationID parameter, set it on the

document loader.

(WebKit::WebFrame::documentLoaderDetached): Pass the message along to the UI process.

* WebProcess/WebPage/WebFrame.h:

* WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::didReceivePolicyDecision): Pass new navigationID parameter along.

* WebProcess/WebPage/WebPage.h:

* WebProcess/WebPage/WebPage.messages.in: Added navigationID parameter.</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="#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="#trunkSourceWebKit2UIProcessWebFrameListenerProxycpp">trunk/Source/WebKit2/UIProcess/WebFrameListenerProxy.cpp</a></li>

<li><a href="#trunkSourceWebKit2UIProcessWebFrameListenerProxyh">trunk/Source/WebKit2/UIProcess/WebFrameListenerProxy.h</a></li>

<li><a href="#trunkSourceWebKit2UIProcessWebFrameProxycpp">trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp</a></li>

<li><a href="#trunkSourceWebKit2UIProcessWebFrameProxyh">trunk/Source/WebKit2/UIProcess/WebFrameProxy.h</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="#trunkSourceWebKit2UIProcesscfWebPageProxyCFcpp">trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebPageWebDocumentLoadercpp">trunk/Source/WebKit2/WebProcess/WebPage/WebDocumentLoader.cpp</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebPageWebDocumentLoaderh">trunk/Source/WebKit2/WebProcess/WebPage/WebDocumentLoader.h</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebPageWebFramecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebPageWebFrameh">trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebKit2ChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170659 => 170660)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-07-01 19:43:48 UTC (rev 170659)

+++ trunk/Source/WebKit2/ChangeLog        2014-07-01 20:22:58 UTC (rev 170660)

</span><span class="lines">@@ -1,3 +1,98 @@

</span><ins>+2014-07-01  Dan Bernstein  &lt;mitz@apple.com&gt;

+

+        [Cocoa] Navigation parameter in navigation delegate messages is nil for navigations started by the Web Content process

+        https://bugs.webkit.org/show_bug.cgi?id=134482

+

+        Reviewed by Tim Horton.

+

+        * UIProcess/API/APILoaderClient.h:

+        (API::LoaderClient::didDestroyNavigation): New client function, called when a navigation ID

+        is not going to be used anymore.

+

+        * UIProcess/API/Cocoa/WKWebView.mm:

+        (-[WKWebView _restoreFromSessionState:]): If restoring triggered a navigation, create a

+        WKNavigation for its ID.

+

+        * UIProcess/Cocoa/NavigationState.h:

+        * UIProcess/Cocoa/NavigationState.mm:

+        (WebKit::NavigationState::createLoadRequestNavigation): Removed FIXME, because we now remove

+        navigations from the map in LoaderClient::didDestroyNavigation.

+        (WebKit::NavigationState::createBackForwardNavigation): Ditto.

+        (WebKit::NavigationState::createReloadNavigation): Ditto.

+        (WebKit::NavigationState::createLoadDataNavigation): Ditto.

+        (WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction): If we are only

+        getting a navigation ID now, create a WKNavigation for it. Also changed to create the

+        NSURLRequest lazily.

+        (WebKit::NavigationState::LoaderClient::didStartProvisionalLoadForFrame): Assert that

+        navigationID is not zero and that it maps to an existing WKNavigation.

+        (WebKit::NavigationState::LoaderClient::didReceiveServerRedirectForProvisionalLoadForFrame):

+        Ditto.

+        (WebKit::NavigationState::LoaderClient::didFailProvisionalLoadWithErrorForFrame): Ditto.

+        (WebKit::NavigationState::LoaderClient::didCommitLoadForFrame): Ditto.

+        (WebKit::NavigationState::LoaderClient::didFinishDocumentLoadForFrame): Ditto.

+        (WebKit::NavigationState::LoaderClient::didFinishLoadForFrame): Ditto.

+        (WebKit::NavigationState::LoaderClient::didFailLoadWithErrorForFrame): Ditto.

+        (WebKit::NavigationState::LoaderClient::didDestroyNavigation): Override the new client

+        function to remove the navigation from the map.

+        (WebKit::NavigationState::LoaderClient::processDidCrash): Clear the navigations map.

+

+        * UIProcess/WebFrameListenerProxy.cpp:

+        (WebKit::WebFrameListenerProxy::WebFrameListenerProxy): Initialize new m_navigationID

+        member variable.

+        (WebKit::WebFrameListenerProxy::receivedPolicyDecision): Pass the navigation ID to

+        WebFrame::receivedPolicyDecision.

+        * UIProcess/WebFrameListenerProxy.h:

+        (WebKit::WebFrameListenerProxy::navigationID): Added this accessor.

+        (WebKit::WebFrameListenerProxy::setNavigationID): Ditto.

+

+        * UIProcess/WebFrameProxy.cpp:

+        (WebKit::WebFrameProxy::receivedPolicyDecision): Added navigationID parameter, which is

+        passed along to the WebPageProxy.

+        * UIProcess/WebFrameProxy.h:

+

+        * UIProcess/WebPageProxy.cpp:

+        (WebKit::WebPageProxy::receivedPolicyDecision): Added navigationID parameter, which is

+        passed along in the message to the Web Content process.

+        (WebKit::WebPageProxy::restoreFromSessionStateData): Changed to return a navigation ID of 0.

+        (WebKit::WebPageProxy::restoreFromState): Changed to return a navigation ID if one was

+        started.

+        (WebKit::WebPageProxy::didDestroyNavigation): Added. Calls the new client function.

+        (WebKit::WebPageProxy::decidePolicyForNavigationAction): Added navigationID and

+        newNavigationID parameters. If a main-frame navigation doesn’t already have an ID, assign it

+        a new ID and return it in the newNavigationID parmeter as well as setting it on the listener

+        for the asynchronous case.

+        * UIProcess/WebPageProxy.h:

+

+        * UIProcess/WebPageProxy.messages.in: Added navigationID and newNavigationID parameters.

+

+        * UIProcess/cf/WebPageProxyCF.cpp:

+        (WebKit::WebPageProxy::restoreFromSessionStateData): Changed to return a navigation ID if

+        one was started.

+

+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

+        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse): Updated for additional

+        parameter.

+        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Send the navigation

+        ID to the UI process, get the new navigation ID from the reply, and set it on the document

+        loader.

+

+        * WebProcess/WebPage/WebDocumentLoader.cpp:

+        (WebKit::WebDocumentLoader::detachFromFrame): Override to let the UI process know that the

+        navigation ID will not be used anymore.

+        * WebProcess/WebPage/WebDocumentLoader.h:

+

+        * WebProcess/WebPage/WebFrame.cpp:

+        (WebKit::WebFrame::didReceivePolicyDecision): Added navigationID parameter, set it on the

+        document loader.

+        (WebKit::WebFrame::documentLoaderDetached): Pass the message along to the UI process.

+        * WebProcess/WebPage/WebFrame.h:

+

+        * WebProcess/WebPage/WebPage.cpp:

+        (WebKit::WebPage::didReceivePolicyDecision): Pass new navigationID parameter along.

+        * WebProcess/WebPage/WebPage.h:

+

+        * WebProcess/WebPage/WebPage.messages.in: Added navigationID parameter.

+

</ins><span class="cx"> 2014-07-01  Anders Carlsson  &lt;andersca@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         Fix build.

</span></span></pre></div>

<a id="trunkSourceWebKit2UIProcessAPIAPILoaderClienth"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h (170659 => 170660)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h        2014-07-01 19:43:48 UTC (rev 170659)

+++ trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h        2014-07-01 20:22:58 UTC (rev 170660)

</span><span class="lines">@@ -65,6 +65,7 @@

</span><span class="cx">     virtual void didSameDocumentNavigationForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::SameDocumentNavigationType, API::Object*) { }

</span><span class="cx">     virtual void didReceiveTitleForFrame(WebKit::WebPageProxy*, const WTF::String&amp;, WebKit::WebFrameProxy*, API::Object*) { }

</span><span class="cx">     virtual void didFirstLayoutForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }

</span><ins>+    virtual void didDestroyNavigation(WebKit::WebPageProxy*, uint64_t navigationID) { }

</ins><span class="cx"> 

<span class="cx">     // FIXME: We should consider removing didFirstVisuallyNonEmptyLayoutForFrame since it is replaced by didLayout.

</span><span class="cx">     virtual void didFirstVisuallyNonEmptyLayoutForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }

</span></span></pre></div>

<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (170659 => 170660)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm        2014-07-01 19:43:48 UTC (rev 170659)

+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm        2014-07-01 20:22:58 UTC (rev 170660)

</span><span class="lines">@@ -1571,7 +1571,9 @@

</span><span class="cx"> - (void)_restoreFromSessionState:(NSData *)sessionState

</span><span class="cx"> {

</span><span class="cx">     [sessionState retain];

</span><del>-    _page-&gt;restoreFromSessionStateData(API::Data::createWithoutCopying((const unsigned char*)sessionState.bytes, sessionState.length, releaseNSData, sessionState).get());

</del><ins>+    uint64_t navigationID = _page-&gt;restoreFromSessionStateData(API::Data::createWithoutCopying((const unsigned char*)sessionState.bytes, sessionState.length, releaseNSData, sessionState).get());

+    if (navigationID)

+        _navigationState-&gt;createReloadNavigation(navigationID);

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> - (void)_close

</span></span></pre></div>

<a id="trunkSourceWebKit2UIProcessCocoaNavigationStateh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (170659 => 170660)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h        2014-07-01 19:43:48 UTC (rev 170659)

+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h        2014-07-01 20:22:58 UTC (rev 170660)

</span><span class="lines">@@ -102,6 +102,7 @@

</span><span class="cx">         virtual void didFinishDocumentLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, uint64_t navigationID, API::Object*) override;

</span><span class="cx">         virtual void didFinishLoadForFrame(WebPageProxy*, WebFrameProxy*, uint64_t navigationID, API::Object*) override;

</span><span class="cx">         virtual void didFailLoadWithErrorForFrame(WebPageProxy*, WebFrameProxy*, uint64_t navigationID, const WebCore::ResourceError&amp;, API::Object*) override;

</span><ins>+        virtual void didDestroyNavigation(WebKit::WebPageProxy*, uint64_t navigationID) override;

</ins><span class="cx">         virtual void didLayout(WebKit::WebPageProxy*, WebCore::LayoutMilestones, API::Object*) override;

</span><span class="cx">         virtual bool canAuthenticateAgainstProtectionSpaceInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::WebProtectionSpace*) override;

</span><span class="cx">         virtual void didReceiveAuthenticationChallengeInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::AuthenticationChallengeProxy*) override;

</span></span></pre></div>

<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (170659 => 170660)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm        2014-07-01 19:43:48 UTC (rev 170659)

+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm        2014-07-01 20:22:58 UTC (rev 170660)

</span><span class="lines">@@ -42,6 +42,7 @@

</span><span class="cx"> #import &quot;WKNSURLAuthenticationChallenge.h&quot;

</span><span class="cx"> #import &quot;WKNSURLExtras.h&quot;

</span><span class="cx"> #import &quot;WKNSURLProtectionSpace.h&quot;

</span><ins>+#import &quot;WKNSURLRequest.h&quot;

</ins><span class="cx"> #import &quot;WKNavigationActionInternal.h&quot;

</span><span class="cx"> #import &quot;WKNavigationDataInternal.h&quot;

</span><span class="cx"> #import &quot;WKNavigationDelegatePrivate.h&quot;

</span><span class="lines">@@ -163,7 +164,6 @@

</span><span class="cx">     RetainPtr&lt;WKNavigation&gt; navigation = adoptNS([[WKNavigation alloc] init]);

</span><span class="cx">     [navigation setRequest:request];

</span><span class="cx"> 

<del>-    // FIXME: We need to remove the navigation when we're done with it!

</del><span class="cx">     m_navigations.set(navigationID, navigation);

</span><span class="cx"> 

</span><span class="cx">     return navigation;

</span><span class="lines">@@ -175,7 +175,6 @@

</span><span class="cx"> 

</span><span class="cx">     auto navigation = adoptNS([[WKNavigation alloc] init]);

</span><span class="cx"> 

<del>-    // FIXME: We need to remove the navigation when we're done with it!

</del><span class="cx">     m_navigations.set(navigationID, navigation);

</span><span class="cx"> 

</span><span class="cx">     return navigation;

</span><span class="lines">@@ -187,7 +186,6 @@

</span><span class="cx"> 

</span><span class="cx">     auto navigation = adoptNS([[WKNavigation alloc] init]);

</span><span class="cx"> 

<del>-    // FIXME: We need to remove the navigation when we're done with it!

</del><span class="cx">     m_navigations.set(navigationID, navigation);

</span><span class="cx"> 

</span><span class="cx">     return navigation;

</span><span class="lines">@@ -199,7 +197,6 @@

</span><span class="cx"> 

</span><span class="cx">     auto navigation = adoptNS([[WKNavigation alloc] init]);

</span><span class="cx"> 

<del>-    // FIXME: We need to remove the navigation when we're done with it!

</del><span class="cx">     m_navigations.set(navigationID, navigation);

</span><span class="cx"> 

</span><span class="cx">     return navigation;

</span><span class="lines">@@ -264,14 +261,18 @@

</span><span class="cx"> 

</span><span class="cx"> void NavigationState::PolicyClient::decidePolicyForNavigationAction(WebPageProxy*, WebFrameProxy* destinationFrame, const NavigationActionData&amp; navigationActionData, WebFrameProxy* sourceFrame, const WebCore::ResourceRequest&amp; originalRequest, const WebCore::ResourceRequest&amp; request, RefPtr&lt;WebFramePolicyListenerProxy&gt; listener, API::Object* userData)

</span><span class="cx"> {

</span><ins>+    RetainPtr&lt;NSURLRequest&gt; nsURLRequest = adoptNS(wrapper(*API::URLRequest::create(request).leakRef()));

+

+    if (listener-&gt;navigationID())

+        m_navigationState.createLoadRequestNavigation(listener-&gt;navigationID(), nsURLRequest.get());

+

</ins><span class="cx">     if (!m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionDecisionHandler) {

</span><span class="cx">         if (!destinationFrame) {

</span><span class="cx">             listener-&gt;use();

</span><span class="cx">             return;

</span><span class="cx">         }

</span><span class="cx"> 

</span><del>-        NSURLRequest *nsURLRequest = request.nsURLRequest(WebCore::DoNotUpdateHTTPBody);

-        if ([NSURLConnection canHandleRequest:nsURLRequest]) {

</del><ins>+        if ([NSURLConnection canHandleRequest:nsURLRequest.get()]) {

</ins><span class="cx">             listener-&gt;use();

</span><span class="cx">             return;

</span><span class="cx">         }

</span><span class="lines">@@ -279,8 +280,8 @@

</span><span class="cx"> #if PLATFORM(MAC)

</span><span class="cx">         // A file URL shouldn't fall through to here, but if it did,

<span class="cx">         // it would be a security risk to open it.

</span><del>-        if (![nsURLRequest.URL isFileURL])

-            [[NSWorkspace sharedWorkspace] openURL:nsURLRequest.URL];

</del><ins>+        if (![[nsURLRequest URL] isFileURL])

+            [[NSWorkspace sharedWorkspace] openURL:[nsURLRequest URL]];

</ins><span class="cx"> #endif

</span><span class="cx">         listener-&gt;ignore();

</span><span class="cx">         return;

</span><span class="lines">@@ -302,7 +303,7 @@

</span><span class="cx">             [navigationAction setSourceFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*sourceFrame]).get()];

</span><span class="cx">     }

</span><span class="cx"> 

</span><del>-    [navigationAction setRequest:request.nsURLRequest(WebCore::DoNotUpdateHTTPBody)];

</del><ins>+    [navigationAction setRequest:nsURLRequest.get()];

</ins><span class="cx">     [navigationAction _setOriginalURL:originalRequest.url()];

</span><span class="cx"> 

</span><span class="cx">     RefPtr&lt;CompletionHandlerCallChecker&gt; checker = CompletionHandlerCallChecker::create(navigationDelegate.get(), @selector(webView:decidePolicyForNavigationAction:decisionHandler:));

</span><span class="lines">@@ -412,10 +413,9 @@

</span><span class="cx">     if (!navigationDelegate)

</span><span class="cx">         return;

</span><span class="cx"> 