<!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>[178141] 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/178141">178141</a></dd>

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

<dt>Date</dt> <dd>2015-01-08 15:48:34 -0800 (Thu, 08 Jan 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>Make WKNavigation bridged to API::Navigation

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

Reviewed by Anders Carlsson.

* Shared/API/APIObject.h:

Add Navigation.

* Shared/Cocoa/APIObject.mm:

(API::Object::newObject):

Bridge to WKNavigation.

* UIProcess/API/APINavigation.cpp: Added.

(API::Navigation::Navigation):

(API::Navigation::~Navigation):

* UIProcess/API/APINavigation.h: Added.

(API::Navigation::create):

(API::Navigation::request):

Add initial implementation.

* UIProcess/API/Cocoa/WKNavigation.mm:

(-[WKNavigation dealloc]):

(-[WKNavigation _request]):

(-[WKNavigation _apiObject]):

* UIProcess/API/Cocoa/WKNavigationInternal.h:

(API::wrapper):

Implement bridging to API::Navigation and get the request from the underlying object.

* UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView loadRequest:]):

(-[WKWebView loadFileURL:allowingReadAccessToURL:]):

(-[WKWebView loadData:MIMEType:characterEncodingName:baseURL:]):

(-[WKWebView goToBackForwardListItem:]):

(-[WKWebView goBack]):

(-[WKWebView goForward]):

(-[WKWebView reload]):

(-[WKWebView reloadFromOrigin]):

(-[WKWebView _restoreSessionState:andNavigate:]):

* UIProcess/Cocoa/NavigationState.h:

* UIProcess/Cocoa/NavigationState.mm:

(WebKit::NavigationState::createLoadRequestNavigation):

(WebKit::NavigationState::createBackForwardNavigation):

(WebKit::NavigationState::createReloadNavigation):

(WebKit::NavigationState::createLoadDataNavigation):

(WebKit::NavigationState::LoaderClient::didStartProvisionalLoadForFrame):

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

(WebKit::NavigationState::LoaderClient::didFailProvisionalLoadWithErrorForFrame):

(WebKit::NavigationState::LoaderClient::didCommitLoadForFrame):

(WebKit::NavigationState::LoaderClient::didFinishDocumentLoadForFrame):

(WebKit::NavigationState::LoaderClient::didFinishLoadForFrame):

(WebKit::NavigationState::LoaderClient::didFailLoadWithErrorForFrame):

(WebKit::NavigationState::LoaderClient::didSameDocumentNavigationForFrame):

Switch to storing API::Navigations.

* WebKit2.xcodeproj/project.pbxproj:

Add the new files.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>

<li><a href="#trunkSourceWebKit2SharedAPIAPIObjecth">trunk/Source/WebKit2/Shared/API/APIObject.h</a></li>

<li><a href="#trunkSourceWebKit2SharedCocoaAPIObjectmm">trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm</a></li>

<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm</a></li>

<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationInternal.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="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>

</ul>

<h3>Added Paths</h3>

<ul>

<li><a href="#trunkSourceWebKit2UIProcessAPIAPINavigationcpp">trunk/Source/WebKit2/UIProcess/API/APINavigation.cpp</a></li>

<li><a href="#trunkSourceWebKit2UIProcessAPIAPINavigationh">trunk/Source/WebKit2/UIProcess/API/APINavigation.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

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

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

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-01-08 23:47:39 UTC (rev 178140)

+++ trunk/Source/WebKit2/ChangeLog        2015-01-08 23:48:34 UTC (rev 178141)

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

</span><ins>+2015-01-08  Sam Weinig  &lt;sam@webkit.org&gt;

+

+        Make WKNavigation bridged to API::Navigation

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

+

+        Reviewed by Anders Carlsson.

+

+        * Shared/API/APIObject.h:

+        Add Navigation.

+

+        * Shared/Cocoa/APIObject.mm:

+        (API::Object::newObject):

+        Bridge to WKNavigation.

+

+        * UIProcess/API/APINavigation.cpp: Added.

+        (API::Navigation::Navigation):

+        (API::Navigation::~Navigation):

+        * UIProcess/API/APINavigation.h: Added.

+        (API::Navigation::create):

+        (API::Navigation::request):

+        Add initial implementation.

+

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

+        (-[WKNavigation dealloc]):

+        (-[WKNavigation _request]):

+        (-[WKNavigation _apiObject]):

+        * UIProcess/API/Cocoa/WKNavigationInternal.h:

+        (API::wrapper):

+        Implement bridging to API::Navigation and get the request from the underlying object.

+

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

+        (-[WKWebView loadRequest:]):

+        (-[WKWebView loadFileURL:allowingReadAccessToURL:]):

+        (-[WKWebView loadData:MIMEType:characterEncodingName:baseURL:]):

+        (-[WKWebView goToBackForwardListItem:]):

+        (-[WKWebView goBack]):

+        (-[WKWebView goForward]):

+        (-[WKWebView reload]):

+        (-[WKWebView reloadFromOrigin]):

+        (-[WKWebView _restoreSessionState:andNavigate:]):

+        * UIProcess/Cocoa/NavigationState.h:

+        * UIProcess/Cocoa/NavigationState.mm:

+        (WebKit::NavigationState::createLoadRequestNavigation):

+        (WebKit::NavigationState::createBackForwardNavigation):

+        (WebKit::NavigationState::createReloadNavigation):

+        (WebKit::NavigationState::createLoadDataNavigation):

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

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

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

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

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

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

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

+        (WebKit::NavigationState::LoaderClient::didSameDocumentNavigationForFrame):

+        Switch to storing API::Navigations.

+

+        * WebKit2.xcodeproj/project.pbxproj:

+        Add the new files.

+

</ins><span class="cx"> 2015-01-08  Dean Jackson  &lt;dino@apple.com&gt;

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

</span><span class="cx">         Text not drawn or white-on-white for &quot;Close Page&quot;/&quot;Go Back&quot; button on safe browsing warning page

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

<a id="trunkSourceWebKit2SharedAPIAPIObjecth"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIObject.h (178140 => 178141)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/Shared/API/APIObject.h        2015-01-08 23:47:39 UTC (rev 178140)

+++ trunk/Source/WebKit2/Shared/API/APIObject.h        2015-01-08 23:48:34 UTC (rev 178141)

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

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

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

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

</span><ins>+        Navigation,

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

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

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

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

<a id="trunkSourceWebKit2SharedCocoaAPIObjectmm"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (178140 => 178141)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm        2015-01-08 23:47:39 UTC (rev 178140)

+++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm        2015-01-08 23:48:34 UTC (rev 178141)

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

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

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

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

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

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

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

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

</span><span class="lines">@@ -128,6 +129,10 @@

</span><span class="cx">         wrapper = [_WKFrameHandle alloc];

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

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

</span><ins>+    case Type::Navigation:

+        wrapper = [WKNavigation alloc];

+        break;

+

</ins><span class="cx">     case Type::NavigationData:

</span><span class="cx">         wrapper = [WKNavigationData alloc];

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

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

<a id="trunkSourceWebKit2UIProcessAPIAPINavigationcpp"></a>

<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/APINavigation.cpp (0 => 178141)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APINavigation.cpp                                (rev 0)

+++ trunk/Source/WebKit2/UIProcess/API/APINavigation.cpp        2015-01-08 23:48:34 UTC (rev 178141)

</span><span class="lines">@@ -0,0 +1,44 @@

</span><ins>+/*

+ * Copyright (C) 2015 Apple Inc. All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ * 1. Redistributions of source code must retain the above copyright

+ *    notice, this list of conditions and the following disclaimer.

+ * 2. Redistributions in binary form must reproduce the above copyright

+ *    notice, this list of conditions and the following disclaimer in the

+ *    documentation and/or other materials provided with the distribution.

+ *

+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS

+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF

+ * THE POSSIBILITY OF SUCH DAMAGE.

+ */

+

+#include &quot;config.h&quot;

+#include &quot;APINavigation.h&quot;

+

+namespace API {

+

+Navigation::Navigation()

+{

+}

+

+Navigation::Navigation(const WebCore::ResourceRequest&amp; request)

+    : m_request(request)

+{

+}

+

+Navigation::~Navigation()

+{

+}

+

+} // namespace WebKit

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

<a id="trunkSourceWebKit2UIProcessAPIAPINavigationh"></a>

<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/APINavigation.h (0 => 178141)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APINavigation.h                                (rev 0)

+++ trunk/Source/WebKit2/UIProcess/API/APINavigation.h        2015-01-08 23:48:34 UTC (rev 178141)

</span><span class="lines">@@ -0,0 +1,61 @@

</span><ins>+/*

+ * Copyright (C) 2015 Apple Inc. All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ * 1. Redistributions of source code must retain the above copyright

+ *    notice, this list of conditions and the following disclaimer.

+ * 2. Redistributions in binary form must reproduce the above copyright

+ *    notice, this list of conditions and the following disclaimer in the

+ *    documentation and/or other materials provided with the distribution.

+ *

+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS

+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF

+ * THE POSSIBILITY OF SUCH DAMAGE.

+ */

+

+#ifndef APINavigation_h

+#define APINavigation_h

+

+#include &quot;APIObject.h&quot;

+#include &lt;WebCore/ResourceRequest.h&gt;

+#include &lt;wtf/Ref.h&gt;

+

+namespace API {

+

+class Navigation : public ObjectImpl&lt;Object::Type::Navigation&gt; {

+public:

+    static Ref&lt;Navigation&gt; create()

+    {

+        return adoptRef(*new Navigation);

+    }

+

+    static Ref&lt;Navigation&gt; create(const WebCore::ResourceRequest&amp; request)

+    {

+        return adoptRef(*new Navigation(request));

+    }

+

+    virtual ~Navigation();

+

+    const WebCore::ResourceRequest&amp; request() const { return m_request; }

+

+private:

+    explicit Navigation();

+    explicit Navigation(const WebCore::ResourceRequest&amp;);

+

+    WebCore::ResourceRequest m_request;

+};

+

+} // namespace API

+

+

+#endif // APINavigation_h

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

<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationmm"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm (178140 => 178141)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm        2015-01-08 23:47:39 UTC (rev 178140)

+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm        2015-01-08 23:48:34 UTC (rev 178141)

</span><span class="lines">@@ -26,18 +26,33 @@

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

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

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

</span><del>-#import &lt;wtf/RetainPtr.h&gt;

</del><ins>+#import &quot;APINavigation.h&quot;

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

</span><span class="cx"> #if WK_API_ENABLED

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

</span><del>-@implementation WKNavigation

</del><ins>+@implementation WKNavigation {

+    API::ObjectStorage&lt;API::Navigation&gt; _navigation;

+}

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

</span><ins>+- (void)dealloc

+{

+    _navigation-&gt;~Navigation();

+

+    [super dealloc];

+}

+

</ins><span class="cx"> - (NSURLRequest *)_request

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

</span><del>-    return _request.get();

</del><ins>+    return _navigation-&gt;request().nsURLRequest(WebCore::DoNotUpdateHTTPBody);

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

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

</span><ins>+#pragma mark WKObject protocol implementation

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

</span><ins>+- (API::Object&amp;)_apiObject

+{

+    return *_navigation;

+}

+

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

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

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

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

<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationInternalh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationInternal.h (178140 => 178141)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationInternal.h        2015-01-08 23:47:39 UTC (rev 178140)

+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationInternal.h        2015-01-08 23:48:34 UTC (rev 178141)

</span><span class="lines">@@ -27,13 +27,21 @@

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

</span><span class="cx"> #if WK_API_ENABLED

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

</span><del>-#import &lt;wtf/RetainPtr.h&gt;

</del><ins>+#import &quot;APINavigation.h&quot;

+#import &quot;WKObject.h&quot;

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

</span><del>-@interface WKNavigation () {

-@package

-    RetainPtr&lt;NSURLRequest&gt; _request;

</del><ins>+namespace API {

+

+inline WKNavigation *wrapper(API::Navigation&amp; navigation)

+{

+    ASSERT([navigation.wrapper() isKindOfClass:[WKNavigation class]]);

+

+    return (WKNavigation *)navigation.wrapper();

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

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

</span><ins>+}

+

+@interface WKNavigation () &lt;WKObject&gt;

</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 (178140 => 178141)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm        2015-01-08 23:47:39 UTC (rev 178140)

+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm        2015-01-08 23:48:34 UTC (rev 178141)

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

</span><span class="cx">     uint64_t navigationID = _page-&gt;loadRequest(request);

</span><span class="cx">     auto navigation = _navigationState-&gt;createLoadRequestNavigation(navigationID, request);

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

</span><del>-    return navigation.autorelease();

</del><ins>+    return [wrapper(navigation.get()) autorelease];

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

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

</span><span class="cx"> - (WKNavigation *)loadFileURL:(NSURL *)URL allowingReadAccessToURL:(NSURL *)readAccessURL

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

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

</span><span class="cx">     auto navigation = _navigationState-&gt;createLoadRequestNavigation(navigationID, [NSURLRequest requestWithURL:URL]);

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

</span><del>-    return navigation.autorelease();

</del><ins>+    return [wrapper(navigation.get()) autorelease];

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

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

</span><span class="cx"> - (WKNavigation *)loadHTMLString:(NSString *)string baseURL:(NSURL *)baseURL

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

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

</span><span class="cx">     auto navigation = _navigationState-&gt;createLoadDataNavigation(navigationID);

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

</span><del>-    return navigation.autorelease();

</del><ins>+    return [wrapper(navigation.get()) autorelease];

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

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

</span><span class="cx"> - (WKNavigation *)goToBackForwardListItem:(WKBackForwardListItem *)item

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

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

</span><span class="cx">     auto navigation = _navigationState-&gt;createBackForwardNavigation(navigationID, item._item);

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

</span><del>-    return navigation.autorelease();

</del><ins>+    return [wrapper(navigation.get()) autorelease];

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

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

</span><span class="cx"> - (NSString *)title

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

</span><span class="cx">     ASSERT(_page-&gt;backForwardList().currentItem());

</span><span class="cx">     auto navigation = _navigationState-&gt;createBackForwardNavigation(navigationID, *_page-&gt;backForwardList().currentItem());

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

</span><del>-    return navigation.autorelease();

</del><ins>+    return [wrapper(navigation.get()) autorelease];

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

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

</span><span class="cx"> - (WKNavigation *)goForward

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

</span><span class="cx">     ASSERT(_page-&gt;backForwardList().currentItem());

</span><span class="cx">     auto navigation = _navigationState-&gt;createBackForwardNavigation(navigationID, *_page-&gt;backForwardList().currentItem());

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

</span><del>-    return navigation.autorelease();

</del><ins>+    return [wrapper(navigation.get()) autorelease];

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

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

</span><span class="cx"> - (WKNavigation *)reload

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

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

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

</span><span class="cx">     auto navigation = _navigationState-&gt;createReloadNavigation(navigationID);

</span><del>-    return navigation.autorelease();

</del><ins>+    return [wrapper(navigation.get()) autorelease];

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

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

</span><span class="cx"> - (WKNavigation *)reloadFromOrigin

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

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

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

</span><span class="cx">     auto navigation = _navigationState-&gt;createReloadNavigation(navigationID);

</span><del>-    return navigation.autorelease();

</del><ins>+    return [wrapper(navigation.get()) autorelease];

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

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

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

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

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

</span><span class="cx">     if (uint64_t navigationID = _page-&gt;restoreFromSessionState(sessionState-&gt;_sessionState, navigate)) {

<span class="cx">         // FIXME: This is not necessarily always a reload navigation.

</span><del>-        return _navigationState-&gt;createReloadNavigation(navigationID).autorelease();

</del><ins>+        auto navigation = _navigationState-&gt;createReloadNavigation(navigationID);

+

+        return [wrapper(navigation.get()) autorelease];

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

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

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

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

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

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

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h        2015-01-08 23:47:39 UTC (rev 178140)

+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h        2015-01-08 23:48:34 UTC (rev 178141)

</span><span class="lines">@@ -38,11 +38,14 @@

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

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

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

</span><del>-@class WKNavigation;

</del><span class="cx"> @class WKWebView;

</span><span class="cx"> @protocol WKHistoryDelegatePrivate;

</span><span class="cx"> @protocol WKNavigationDelegate;

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

</span><ins>+namespace API {

+class Navigation;

+}

+

</ins><span class="cx"> namespace WebKit {

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

</span><span class="cx"> struct WebNavigationDataStore;

</span><span class="lines">@@ -63,10 +66,10 @@

</span><span class="cx">     RetainPtr&lt;id &lt;WKHistoryDelegatePrivate&gt; &gt; historyDelegate();

</span><span class="cx">     void setHistoryDelegate(id &lt;WKHistoryDelegatePrivate&gt;);

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

</span><del>-    RetainPtr&lt;WKNavigation&gt; createBackForwardNavigation(uint64_t navigationID, const WebBackForwardListItem&amp;);

-    RetainPtr&lt;WKNavigation&gt; createLoadRequestNavigation(uint64_t navigationID, NSURLRequest *);

-    RetainPtr&lt;WKNavigation&gt; createReloadNavigation(uint64_t navigationID);

-    RetainPtr&lt;WKNavigation&gt; createLoadDataNavigation(uint64_t navigationID);

</del><ins>+    Ref&lt;API::Navigation&gt; createBackForwardNavigation(uint64_t navigationID, const WebBackForwardListItem&amp;);

+    Ref&lt;API::Navigation&gt; createLoadRequestNavigation(uint64_t navigationID, NSURLRequest *);

+    Ref&lt;API::Navigation&gt; createReloadNavigation(uint64_t navigationID);

+    Ref&lt;API::Navigation&gt; createLoadDataNavigation(uint64_t navigationID);

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

<span class="cx">     // Called by the page client.

</span><span class="cx">     void navigationGestureDidBegin();

</span><span class="lines">@@ -174,7 +177,7 @@

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

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

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

</span><del>-    HashMap&lt;uint64_t, RetainPtr&lt;WKNavigation&gt;&gt; m_navigations;

</del><ins>+    HashMap&lt;uint64_t, RefPtr&lt;API::Navigation&gt;&gt; m_navigations;

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

</span><span class="cx">     WeakObjCPtr&lt;id &lt;WKHistoryDelegatePrivate&gt; &gt; m_historyDelegate;

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

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

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

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

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm        2015-01-08 23:47:39 UTC (rev 178140)

+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm        2015-01-08 23:48:34 UTC (rev 178141)

</span><span class="lines">@@ -164,47 +164,46 @@

</span><span class="cx">     m_historyDelegateMethods.webViewDidUpdateHistoryTitleForURL = [historyDelegate respondsToSelector:@selector(_webView:didUpdateHistoryTitle:forURL:)];

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

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

</span><del>-RetainPtr&lt;WKNavigation&gt; NavigationState::createLoadRequestNavigation(uint64_t navigationID, NSURLRequest *request)

</del><ins>+Ref&lt;API::Navigation&gt; NavigationState::createLoadRequestNavigation(uint64_t navigationID, NSURLRequest *request)

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

</span><span class="cx">     ASSERT(!m_navigations.contains(navigationID));

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

</span><del>-    RetainPtr&lt;WKNavigation&gt; navigation = adoptNS([[WKNavigation alloc] init]);

-    navigation-&gt;_request = request;

</del><ins>+    auto navigation = API::Navigation::create(WebCore::ResourceRequest(request));

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

</span><del>-    m_navigations.set(navigationID, navigation);

</del><ins>+    m_navigations.set(navigationID, navigation.ptr());

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

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

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

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

</span><del>-RetainPtr&lt;WKNavigation&gt; NavigationState::createBackForwardNavigation(uint64_t navigationID, const WebBackForwardListItem&amp; item)

</del><ins>+Ref&lt;API::Navigation&gt; NavigationState::createBackForwardNavigation(uint64_t navigationID, const WebBackForwardListItem&amp; item)

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

</span><span class="cx">     ASSERT(!m_navigations.contains(navigationID));

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

</span><del>-    auto navigation = adoptNS([[WKNavigation alloc] init]);

</del><ins>+    auto navigation = API::Navigation::create();

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

</span><del>-    m_navigations.set(navigationID, navigation);

</del><ins>+    m_navigations.set(navigationID, navigation.ptr());

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

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

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

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

</span><del>-RetainPtr&lt;WKNavigation&gt; NavigationState::createReloadNavigation(uint64_t navigationID)

</del><ins>+Ref&lt;API::Navigation&gt; NavigationState::createReloadNavigation(uint64_t navigationID)

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

</span><span class="cx">     ASSERT(!m_navigations.contains(navigationID));

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

</span><del>-    auto navigation = adoptNS([[WKNavigation alloc] init]);

</del><ins>+    auto navigation = API::Navigation::create();

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

</span><del>-    m_navigations.set(navigationID, navigation);

</del><ins>+    m_navigations.set(navigationID, navigation.ptr());

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

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

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

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

</span><del>-RetainPtr&lt;WKNavigation&gt; NavigationState::createLoadDataNavigation(uint64_t navigationID)

</del><ins>+Ref&lt;API::Navigation&gt; NavigationState::createLoadDataNavigation(uint64_t navigationID)

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

</span><span class="cx">     ASSERT(!m_navigations.contains(navigationID));

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

</span><del>-    auto navigation = adoptNS([[WKNavigation alloc] init]);

</del><ins>+    auto navigation = API::Navigation::create();

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

</span><del>-    m_navigations.set(navigationID, navigation);

</del><ins>+    m_navigations.set(navigationID, navigation.ptr());

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

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

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

</span><span class="lines">@@ -423,7 +422,7 @@