<!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>[177636] 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/177636">177636</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-12-22 11:04:45 -0800 (Mon, 22 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow the WebContext's history client to coexist with WKWebView's history delegate
https://bugs.webkit.org/show_bug.cgi?id=139857
Reviewed by Anders Carlsson.
- Renames API::HistoryClient to API::LegacyContextHistoryClient to make it clear what it is for.
- Re-routes the history client functions from the WebProcessProxy to the WebPageProxy.
- Add history client functions to API::LoaderClient and implement them for NavigationState's
LoaderClient subclass. Removes the need for WKProcessPool to have to setup a history client and
forward to the NavigationState.
* UIProcess/API/APIHistoryClient.h: Removed.
* UIProcess/API/APILegacyContextHistoryClient.h: Copied from Source/WebKit2/UIProcess/API/APIHistoryClient.h.
(API::LegacyContextHistoryClient::~LegacyContextHistoryClient):
(API::LegacyContextHistoryClient::didNavigateWithNavigationData):
(API::LegacyContextHistoryClient::didPerformClientRedirect):
(API::LegacyContextHistoryClient::didPerformServerRedirect):
(API::LegacyContextHistoryClient::didUpdateHistoryTitle):
(API::LegacyContextHistoryClient::populateVisitedLinks):
(API::HistoryClient::~HistoryClient): Deleted.
(API::HistoryClient::didNavigateWithNavigationData): Deleted.
(API::HistoryClient::didPerformClientRedirect): Deleted.
(API::HistoryClient::didPerformServerRedirect): Deleted.
(API::HistoryClient::didUpdateHistoryTitle): Deleted.
(API::HistoryClient::populateVisitedLinks): Deleted.
* UIProcess/API/APILoaderClient.h:
(API::LoaderClient::didNavigateWithNavigationData):
(API::LoaderClient::didPerformClientRedirect):
(API::LoaderClient::didPerformServerRedirect):
(API::LoaderClient::didUpdateHistoryTitle):
* UIProcess/API/C/WKContext.cpp:
(WKContextSetHistoryClient):
* UIProcess/API/Cocoa/WKProcessPool.mm:
(-[WKProcessPool _initWithConfiguration:]):
* UIProcess/API/mac/WKView.mm:
* UIProcess/Cocoa/HistoryClient.h: Removed.
* UIProcess/Cocoa/HistoryClient.mm: Removed.
* UIProcess/Cocoa/NavigationState.h:
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::LoaderClient::didNavigateWithNavigationData):
(WebKit::NavigationState::LoaderClient::didPerformClientRedirect):
(WebKit::NavigationState::LoaderClient::didPerformServerRedirect):
(WebKit::NavigationState::LoaderClient::didUpdateHistoryTitle):
(WebKit::NavigationState::didNavigateWithNavigationData): Deleted.
(WebKit::NavigationState::didPerformClientRedirect): Deleted.
(WebKit::NavigationState::didPerformServerRedirect): Deleted.
(WebKit::NavigationState::didUpdateHistoryTitle): Deleted.
* UIProcess/WebContext.cpp:
(WebKit::WebContext::WebContext):
(WebKit::WebContext::setHistoryClient):
(WebKit::WebContext::populateVisitedLinks):
* UIProcess/WebContext.h:
(WebKit::WebContext::historyClient):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didNavigateWithNavigationData):
(WebKit::WebPageProxy::didPerformClientRedirect):
(WebKit::WebPageProxy::didPerformServerRedirect):
(WebKit::WebPageProxy::didUpdateHistoryTitle):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::didNavigateWithNavigationData): Deleted.
(WebKit::WebProcessProxy::didPerformClientRedirect): Deleted.
(WebKit::WebProcessProxy::didPerformServerRedirect): Deleted.
(WebKit::WebProcessProxy::didUpdateHistoryTitle): Deleted.
* UIProcess/WebProcessProxy.h:
* UIProcess/WebProcessProxy.messages.in:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::updateGlobalHistory):
(WebKit::WebFrameLoaderClient::updateGlobalHistoryRedirectLinks):
(WebKit::WebFrameLoaderClient::setTitle):</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="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.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="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.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="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxymessagesin">trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPILegacyContextHistoryClienth">trunk/Source/WebKit2/UIProcess/API/APILegacyContextHistoryClient.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIHistoryClienth">trunk/Source/WebKit2/UIProcess/API/APIHistoryClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaHistoryClienth">trunk/Source/WebKit2/UIProcess/Cocoa/HistoryClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaHistoryClientmm">trunk/Source/WebKit2/UIProcess/Cocoa/HistoryClient.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -1,3 +1,78 @@
</span><ins>+2014-12-21 Sam Weinig <sam@webkit.org>
+
+ Allow the WebContext's history client to coexist with WKWebView's history delegate
+ https://bugs.webkit.org/show_bug.cgi?id=139857
+
+ Reviewed by Anders Carlsson.
+
+ - Renames API::HistoryClient to API::LegacyContextHistoryClient to make it clear what it is for.
+ - Re-routes the history client functions from the WebProcessProxy to the WebPageProxy.
+ - Add history client functions to API::LoaderClient and implement them for NavigationState's
+ LoaderClient subclass. Removes the need for WKProcessPool to have to setup a history client and
+ forward to the NavigationState.
+
+ * UIProcess/API/APIHistoryClient.h: Removed.
+ * UIProcess/API/APILegacyContextHistoryClient.h: Copied from Source/WebKit2/UIProcess/API/APIHistoryClient.h.
+ (API::LegacyContextHistoryClient::~LegacyContextHistoryClient):
+ (API::LegacyContextHistoryClient::didNavigateWithNavigationData):
+ (API::LegacyContextHistoryClient::didPerformClientRedirect):
+ (API::LegacyContextHistoryClient::didPerformServerRedirect):
+ (API::LegacyContextHistoryClient::didUpdateHistoryTitle):
+ (API::LegacyContextHistoryClient::populateVisitedLinks):
+ (API::HistoryClient::~HistoryClient): Deleted.
+ (API::HistoryClient::didNavigateWithNavigationData): Deleted.
+ (API::HistoryClient::didPerformClientRedirect): Deleted.
+ (API::HistoryClient::didPerformServerRedirect): Deleted.
+ (API::HistoryClient::didUpdateHistoryTitle): Deleted.
+ (API::HistoryClient::populateVisitedLinks): Deleted.
+ * UIProcess/API/APILoaderClient.h:
+ (API::LoaderClient::didNavigateWithNavigationData):
+ (API::LoaderClient::didPerformClientRedirect):
+ (API::LoaderClient::didPerformServerRedirect):
+ (API::LoaderClient::didUpdateHistoryTitle):
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextSetHistoryClient):
+ * UIProcess/API/Cocoa/WKProcessPool.mm:
+ (-[WKProcessPool _initWithConfiguration:]):
+ * UIProcess/API/mac/WKView.mm:
+ * UIProcess/Cocoa/HistoryClient.h: Removed.
+ * UIProcess/Cocoa/HistoryClient.mm: Removed.
+ * UIProcess/Cocoa/NavigationState.h:
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::LoaderClient::didNavigateWithNavigationData):
+ (WebKit::NavigationState::LoaderClient::didPerformClientRedirect):
+ (WebKit::NavigationState::LoaderClient::didPerformServerRedirect):
+ (WebKit::NavigationState::LoaderClient::didUpdateHistoryTitle):
+ (WebKit::NavigationState::didNavigateWithNavigationData): Deleted.
+ (WebKit::NavigationState::didPerformClientRedirect): Deleted.
+ (WebKit::NavigationState::didPerformServerRedirect): Deleted.
+ (WebKit::NavigationState::didUpdateHistoryTitle): Deleted.
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::WebContext):
+ (WebKit::WebContext::setHistoryClient):
+ (WebKit::WebContext::populateVisitedLinks):
+ * UIProcess/WebContext.h:
+ (WebKit::WebContext::historyClient):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didNavigateWithNavigationData):
+ (WebKit::WebPageProxy::didPerformClientRedirect):
+ (WebKit::WebPageProxy::didPerformServerRedirect):
+ (WebKit::WebPageProxy::didUpdateHistoryTitle):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::didNavigateWithNavigationData): Deleted.
+ (WebKit::WebProcessProxy::didPerformClientRedirect): Deleted.
+ (WebKit::WebProcessProxy::didPerformServerRedirect): Deleted.
+ (WebKit::WebProcessProxy::didUpdateHistoryTitle): Deleted.
+ * UIProcess/WebProcessProxy.h:
+ * UIProcess/WebProcessProxy.messages.in:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::updateGlobalHistory):
+ (WebKit::WebFrameLoaderClient::updateGlobalHistoryRedirectLinks):
+ (WebKit::WebFrameLoaderClient::setTitle):
+
</ins><span class="cx"> 2014-12-22 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] another outdated comment
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIHistoryClienth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/APIHistoryClient.h (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIHistoryClient.h 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/UIProcess/API/APIHistoryClient.h 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 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 APIHistoryClient_h
-#define APIHistoryClient_h
-
-#include <wtf/Forward.h>
-
-namespace WebKit {
-class WebContext;
-class WebFrameProxy;
-class WebPageProxy;
-struct WebNavigationDataStore;
-}
-
-namespace API {
-
-class HistoryClient {
-public:
- virtual ~HistoryClient() { }
-
- virtual void didNavigateWithNavigationData(WebKit::WebContext*, WebKit::WebPageProxy*, const WebKit::WebNavigationDataStore&, WebKit::WebFrameProxy*) { }
- virtual void didPerformClientRedirect(WebKit::WebContext*, WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*) { }
- virtual void didPerformServerRedirect(WebKit::WebContext*, WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*) { }
- virtual void didUpdateHistoryTitle(WebKit::WebContext*, WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*) { }
- virtual void populateVisitedLinks(WebKit::WebContext*) { }
-
- // FIXME: This is only used by the legacy SPI. We should add an API::Context object that
- // can hold these things so we won't have to get it through API::HistoryClient.
- virtual bool addsVisitedLinks() const { return false; }
-};
-
-} // namespace API
-
-#endif // APIHistoryClient_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPILegacyContextHistoryClienthfromrev177617trunkSourceWebKit2UIProcessAPIAPIHistoryClienth"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/APILegacyContextHistoryClient.h (from rev 177617, trunk/Source/WebKit2/UIProcess/API/APIHistoryClient.h) (0 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APILegacyContextHistoryClient.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/APILegacyContextHistoryClient.h 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+/*
+ * Copyright (C) 2014 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 APILegacyContextHistoryClient_h
+#define APILegacyContextHistoryClient_h
+
+#include <wtf/Forward.h>
+
+namespace WebKit {
+class WebContext;
+class WebFrameProxy;
+class WebPageProxy;
+struct WebNavigationDataStore;
+}
+
+namespace API {
+
+class LegacyContextHistoryClient {
+public:
+ virtual ~LegacyContextHistoryClient() { }
+
+ virtual void didNavigateWithNavigationData(WebKit::WebContext&, WebKit::WebPageProxy&, const WebKit::WebNavigationDataStore&, WebKit::WebFrameProxy&) { }
+ virtual void didPerformClientRedirect(WebKit::WebContext&, WebKit::WebPageProxy&, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy&) { }
+ virtual void didPerformServerRedirect(WebKit::WebContext&, WebKit::WebPageProxy&, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy&) { }
+ virtual void didUpdateHistoryTitle(WebKit::WebContext&, WebKit::WebPageProxy&, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy&) { }
+ virtual void populateVisitedLinks(WebKit::WebContext&) { }
+ virtual bool addsVisitedLinks() const { return false; }
+};
+
+} // namespace API
+
+#endif // APILegacyContextHistoryClient_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPILoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> class WebFrameProxy;
</span><span class="cx"> class WebPageProxy;
</span><span class="cx"> class WebProtectionSpace;
</span><ins>+struct WebNavigationDataStore;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="lines">@@ -96,6 +97,11 @@
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<Data> webCryptoMasterKey(WebKit::WebPageProxy&) { return nullptr; }
</span><span class="cx">
</span><ins>+ virtual void didNavigateWithNavigationData(WebKit::WebPageProxy&, const WebKit::WebNavigationDataStore&, WebKit::WebFrameProxy&) { }
+ virtual void didPerformClientRedirect(WebKit::WebPageProxy&, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy&) { }
+ virtual void didPerformServerRedirect(WebKit::WebPageProxy&, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy&) { }
+ virtual void didUpdateHistoryTitle(WebKit::WebPageProxy&, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy&) { }
+
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> virtual WebKit::PluginModuleLoadPolicy pluginLoadPolicy(WebKit::WebPageProxy*, WebKit::PluginModuleLoadPolicy currentPluginLoadPolicy, WebKit::ImmutableDictionary*, WTF::String& /* unavailabilityDescription */) { return currentPluginLoadPolicy; }
</span><span class="cx"> virtual void didFailToInitializePlugin(WebKit::WebPageProxy*, WebKit::ImmutableDictionary*) { }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "APIClient.h"
</span><span class="cx"> #include "APIContextConfiguration.h"
</span><span class="cx"> #include "APIDownloadClient.h"
</span><del>-#include "APIHistoryClient.h"
</del><ins>+#include "APILegacyContextHistoryClient.h"
</ins><span class="cx"> #include "APINavigationData.h"
</span><span class="cx"> #include "APIURLRequest.h"
</span><span class="cx"> #include "AuthenticationChallengeProxy.h"
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">
</span><span class="cx"> void WKContextSetHistoryClient(WKContextRef contextRef, const WKContextHistoryClientBase* wkClient)
</span><span class="cx"> {
</span><del>- class HistoryClient final : public API::Client<WKContextHistoryClientBase>, public API::HistoryClient {
</del><ins>+ class HistoryClient final : public API::Client<WKContextHistoryClientBase>, public API::LegacyContextHistoryClient {
</ins><span class="cx"> public:
</span><span class="cx"> explicit HistoryClient(const WKContextHistoryClientBase* client)
</span><span class="cx"> {
</span><span class="lines">@@ -116,45 +116,45 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual void didNavigateWithNavigationData(WebContext* context, WebPageProxy* page, const WebNavigationDataStore& navigationDataStore, WebFrameProxy* frame) override
</del><ins>+ virtual void didNavigateWithNavigationData(WebContext& context, WebPageProxy& page, const WebNavigationDataStore& navigationDataStore, WebFrameProxy& frame) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.didNavigateWithNavigationData)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RefPtr<API::NavigationData> navigationData = API::NavigationData::create(navigationDataStore);
</span><del>- m_client.didNavigateWithNavigationData(toAPI(context), toAPI(page), toAPI(navigationData.get()), toAPI(frame), m_client.base.clientInfo);
</del><ins>+ m_client.didNavigateWithNavigationData(toAPI(&context), toAPI(&page), toAPI(navigationData.get()), toAPI(&frame), m_client.base.clientInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void didPerformClientRedirect(WebContext* context, WebPageProxy* page, const String& sourceURL, const String& destinationURL, WebFrameProxy* frame) override
</del><ins>+ virtual void didPerformClientRedirect(WebContext& context, WebPageProxy& page, const String& sourceURL, const String& destinationURL, WebFrameProxy& frame) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.didPerformClientRedirect)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_client.didPerformClientRedirect(toAPI(context), toAPI(page), toURLRef(sourceURL.impl()), toURLRef(destinationURL.impl()), toAPI(frame), m_client.base.clientInfo);
</del><ins>+ m_client.didPerformClientRedirect(toAPI(&context), toAPI(&page), toURLRef(sourceURL.impl()), toURLRef(destinationURL.impl()), toAPI(&frame), m_client.base.clientInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void didPerformServerRedirect(WebContext* context, WebPageProxy* page, const String& sourceURL, const String& destinationURL, WebFrameProxy* frame) override
</del><ins>+ virtual void didPerformServerRedirect(WebContext& context, WebPageProxy& page, const String& sourceURL, const String& destinationURL, WebFrameProxy& frame) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.didPerformServerRedirect)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_client.didPerformServerRedirect(toAPI(context), toAPI(page), toURLRef(sourceURL.impl()), toURLRef(destinationURL.impl()), toAPI(frame), m_client.base.clientInfo);
</del><ins>+ m_client.didPerformServerRedirect(toAPI(&context), toAPI(&page), toURLRef(sourceURL.impl()), toURLRef(destinationURL.impl()), toAPI(&frame), m_client.base.clientInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void didUpdateHistoryTitle(WebContext* context, WebPageProxy* page, const String& title, const String& url, WebFrameProxy* frame) override
</del><ins>+ virtual void didUpdateHistoryTitle(WebContext& context, WebPageProxy& page, const String& title, const String& url, WebFrameProxy& frame) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.didUpdateHistoryTitle)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_client.didUpdateHistoryTitle(toAPI(context), toAPI(page), toAPI(title.impl()), toURLRef(url.impl()), toAPI(frame), m_client.base.clientInfo);
</del><ins>+ m_client.didUpdateHistoryTitle(toAPI(&context), toAPI(&page), toAPI(title.impl()), toURLRef(url.impl()), toAPI(&frame), m_client.base.clientInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void populateVisitedLinks(WebContext* context) override
</del><ins>+ virtual void populateVisitedLinks(WebContext& context) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.populateVisitedLinks)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_client.populateVisitedLinks(toAPI(context), m_client.base.clientInfo);
</del><ins>+ m_client.populateVisitedLinks(toAPI(&context), m_client.base.clientInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual bool addsVisitedLinks() const override
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #import "CacheModel.h"
</span><span class="cx"> #import "DownloadClient.h"
</span><del>-#import "HistoryClient.h"
</del><span class="cx"> #import "ProcessModel.h"
</span><span class="cx"> #import "SandboxUtilities.h"
</span><span class="cx"> #import "WKObject.h"
</span><span class="lines">@@ -170,7 +169,6 @@
</span><span class="cx"> webContextConfiguration.mediaKeysStorageDirectory = websiteDataDirectoryURL(@"MediaKeys").absoluteURL.path.fileSystemRepresentation;
</span><span class="cx">
</span><span class="cx"> API::Object::constructInWrapper<WebKit::WebContext>(self, WTF::move(webContextConfiguration));
</span><del>- _context->setHistoryClient(std::make_unique<WebKit::HistoryClient>());
</del><span class="cx"> _context->setUsesNetworkProcess(true);
</span><span class="cx"> _context->setProcessModel(WebKit::ProcessModelMultipleSecondaryProcesses);
</span><span class="cx"> _context->setMaximumNumberOfProcesses([_configuration maximumProcessCount]);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #import <AppKit/NSAttributedString.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#import "APIHistoryClient.h"
</del><ins>+#import "APILegacyContextHistoryClient.h"
</ins><span class="cx"> #import "ActionMenuHitTestResult.h"
</span><span class="cx"> #import "AttributedString.h"
</span><span class="cx"> #import "ColorSpaceData.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaHistoryClienth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/Cocoa/HistoryClient.h (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/HistoryClient.h 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/HistoryClient.h 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -1,55 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 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 HistoryClient_h
-#define HistoryClient_h
-
-#import "WKFoundation.h"
-
-#if WK_API_ENABLED
-
-#import "APIHistoryClient.h"
-
-namespace WebKit {
-
-class HistoryClient : public API::HistoryClient {
-public:
- HistoryClient();
- ~HistoryClient();
-
-private:
- // API::HistoryClient
- virtual void didNavigateWithNavigationData(WebContext*, WebPageProxy*, const WebNavigationDataStore&, WebFrameProxy*) override;
- virtual void didPerformClientRedirect(WebContext*, WebPageProxy*, const WTF::String& sourceURL, const WTF::String& destinationURL, WebFrameProxy*) override;
- virtual void didPerformServerRedirect(WebContext*, WebPageProxy*, const WTF::String& sourceURL, const WTF::String& destinationURL, WebFrameProxy*) override;
- virtual void didUpdateHistoryTitle(WebContext*, WebPageProxy*, const WTF::String& title, const WTF::String& url, WebFrameProxy*) override;
- virtual void populateVisitedLinks(WebContext*) override;
-};
-
-} // namespace WebKit
-
-#endif // WK_API_ENABLED
-
-#endif // HistoryClient_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaHistoryClientmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/Cocoa/HistoryClient.mm (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/HistoryClient.mm 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/HistoryClient.mm 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -1,91 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 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.
- */
-
-#import "config.h"
-#import "HistoryClient.h"
-
-#if WK_API_ENABLED
-
-#import "NavigationState.h"
-#import "WKHistoryDelegatePrivate.h"
-#import "WebFrameProxy.h"
-
-namespace WebKit {
-
-HistoryClient::HistoryClient()
-{
-}
-
-HistoryClient::~HistoryClient()
-{
-}
-
-void HistoryClient::didNavigateWithNavigationData(WebContext*, WebPageProxy* webPageProxy, const WebNavigationDataStore& navigationDataStore, WebFrameProxy* webFrameProxy)
-{
- if (!webFrameProxy->isMainFrame())
- return;
-
- auto& navigationState = NavigationState::fromWebPage(*webPageProxy);
-
- navigationState.didNavigateWithNavigationData(navigationDataStore);
-}
-
-void HistoryClient::didPerformClientRedirect(WebContext*, WebPageProxy* webPageProxy, const WTF::String& sourceURL, const WTF::String& destinationURL, WebFrameProxy* webFrameProxy)
-{
- if (!webFrameProxy->isMainFrame())
- return;
-
- auto& navigationState = NavigationState::fromWebPage(*webPageProxy);
-
- navigationState.didPerformClientRedirect(sourceURL, destinationURL);
-}
-
-void HistoryClient::didPerformServerRedirect(WebContext*, WebPageProxy* webPageProxy, const WTF::String& sourceURL, const WTF::String& destinationURL, WebFrameProxy* webFrameProxy)
-{
- if (!webFrameProxy->isMainFrame())
- return;
-
- auto& navigationState = NavigationState::fromWebPage(*webPageProxy);
-
- navigationState.didPerformServerRedirect(sourceURL, destinationURL);
-}
-
-void HistoryClient::didUpdateHistoryTitle(WebContext*, WebPageProxy* webPageProxy, const WTF::String& title, const WTF::String& url, WebFrameProxy* webFrameProxy)
-{
- if (!webFrameProxy->isMainFrame())
- return;
-
- auto& navigationState = NavigationState::fromWebPage(*webPageProxy);
-
- navigationState.didUpdateHistoryTitle(title, url);
-}
-
-void HistoryClient::populateVisitedLinks(WebContext*)
-{
-}
-
-} // namespace webKit
-
-#endif // WK_API_ENABLED
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -68,12 +68,6 @@
</span><span class="cx"> RetainPtr<WKNavigation> createReloadNavigation(uint64_t navigationID);
</span><span class="cx"> RetainPtr<WKNavigation> createLoadDataNavigation(uint64_t navigationID);
</span><span class="cx">
</span><del>- // Called by the history client.
- void didNavigateWithNavigationData(const WebKit::WebNavigationDataStore&);
- void didPerformClientRedirect(const WTF::String& sourceURL, const WTF::String& destinationURL);
- void didPerformServerRedirect(const WTF::String& sourceURL, const WTF::String& destinationURL);
- void didUpdateHistoryTitle(const WTF::String& title, const WTF::String& url);
-
</del><span class="cx"> // Called by the page client.
</span><span class="cx"> void navigationGestureDidBegin();
</span><span class="cx"> void navigationGestureWillEnd(bool willNavigate, WebBackForwardListItem&);
</span><span class="lines">@@ -115,11 +109,17 @@
</span><span class="cx"> virtual void didReceiveAuthenticationChallengeInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::AuthenticationChallengeProxy*) override;
</span><span class="cx"> virtual void processDidCrash(WebKit::WebPageProxy*) override;
</span><span class="cx"> virtual PassRefPtr<API::Data> webCryptoMasterKey(WebKit::WebPageProxy&) override;
</span><ins>+
</ins><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> virtual void didStartLoadForQuickLookDocumentInMainFrame(const WTF::String& fileName, const WTF::String& uti) override;
</span><span class="cx"> virtual void didFinishLoadForQuickLookDocumentInMainFrame(const WebKit::QuickLookDocumentData&) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ virtual void didNavigateWithNavigationData(WebKit::WebPageProxy&, const WebKit::WebNavigationDataStore&, WebKit::WebFrameProxy&) override;
+ virtual void didPerformClientRedirect(WebKit::WebPageProxy&, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy&) override;
+ virtual void didPerformServerRedirect(WebKit::WebPageProxy&, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy&) override;
+ virtual void didUpdateHistoryTitle(WebKit::WebPageProxy&, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy&) override;
+
</ins><span class="cx"> NavigationState& m_navigationState;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -208,54 +208,6 @@
</span><span class="cx"> return navigation;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NavigationState::didNavigateWithNavigationData(const WebKit::WebNavigationDataStore& navigationDataStore)
-{
- if (!m_historyDelegateMethods.webViewDidNavigateWithNavigationData)
- return;
-
- auto historyDelegate = m_historyDelegate.get();
- if (!historyDelegate)
- return;
-
- [historyDelegate _webView:m_webView didNavigateWithNavigationData:wrapper(*API::NavigationData::create(navigationDataStore))];
-}
-
-void NavigationState::didPerformClientRedirect(const WTF::String& sourceURL, const WTF::String& destinationURL)
-{
- if (!m_historyDelegateMethods.webViewDidPerformClientRedirectFromURLToURL)
- return;
-
- auto historyDelegate = m_historyDelegate.get();
- if (!historyDelegate)
- return;
-
- [historyDelegate _webView:m_webView didPerformClientRedirectFromURL:[NSURL _web_URLWithWTFString:sourceURL] toURL:[NSURL _web_URLWithWTFString:destinationURL]];
-}
-
-void NavigationState::didPerformServerRedirect(const WTF::String& sourceURL, const WTF::String& destinationURL)
-{
- if (!m_historyDelegateMethods.webViewDidPerformServerRedirectFromURLToURL)
- return;
-
- auto historyDelegate = m_historyDelegate.get();
- if (!historyDelegate)
- return;
-
- [historyDelegate _webView:m_webView didPerformServerRedirectFromURL:[NSURL _web_URLWithWTFString:sourceURL] toURL:[NSURL _web_URLWithWTFString:destinationURL]];
-}
-
-void NavigationState::didUpdateHistoryTitle(const WTF::String& title, const WTF::String& url)
-{
- if (!m_historyDelegateMethods.webViewDidUpdateHistoryTitleForURL)
- return;
-
- auto historyDelegate = m_historyDelegate.get();
- if (!historyDelegate)
- return;
-
- [historyDelegate _webView:m_webView didUpdateHistoryTitle:title forURL:[NSURL _web_URLWithWTFString:url]];
-}
-
</del><span class="cx"> void NavigationState::navigationGestureDidBegin()
</span><span class="cx"> {
</span><span class="cx"> if (!m_navigationDelegateMethods.webViewDidBeginNavigationGesture)
</span><span class="lines">@@ -806,6 +758,68 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+// HistoryDelegatePrivate support
+
+void NavigationState::LoaderClient::didNavigateWithNavigationData(WebKit::WebPageProxy&, const WebKit::WebNavigationDataStore& navigationDataStore, WebKit::WebFrameProxy& webFrameProxy)
+{
+ if (!webFrameProxy.isMainFrame())
+ return;
+
+ if (!m_navigationState.m_historyDelegateMethods.webViewDidNavigateWithNavigationData)
+ return;
+
+ auto historyDelegate = m_navigationState.m_historyDelegate.get();
+ if (!historyDelegate)
+ return;
+
+ [historyDelegate _webView:m_navigationState.m_webView didNavigateWithNavigationData:wrapper(*API::NavigationData::create(navigationDataStore))];
+}
+
+void NavigationState::LoaderClient::didPerformClientRedirect(WebKit::WebPageProxy&, const WTF::String& sourceURL, const WTF::String& destinationURL, WebKit::WebFrameProxy& webFrameProxy)
+{
+ if (!webFrameProxy.isMainFrame())
+ return;
+
+ if (!m_navigationState.m_historyDelegateMethods.webViewDidPerformClientRedirectFromURLToURL)
+ return;
+
+ auto historyDelegate = m_navigationState.m_historyDelegate.get();
+ if (!historyDelegate)
+ return;
+
+ [historyDelegate _webView:m_navigationState.m_webView didPerformClientRedirectFromURL:[NSURL _web_URLWithWTFString:sourceURL] toURL:[NSURL _web_URLWithWTFString:destinationURL]];
+}
+
+void NavigationState::LoaderClient::didPerformServerRedirect(WebKit::WebPageProxy&, const WTF::String& sourceURL, const WTF::String& destinationURL, WebKit::WebFrameProxy& webFrameProxy)
+{
+ if (!webFrameProxy.isMainFrame())
+ return;
+
+ if (!m_navigationState.m_historyDelegateMethods.webViewDidPerformServerRedirectFromURLToURL)
+ return;
+
+ auto historyDelegate = m_navigationState.m_historyDelegate.get();
+ if (!historyDelegate)
+ return;
+
+ [historyDelegate _webView:m_navigationState.m_webView didPerformServerRedirectFromURL:[NSURL _web_URLWithWTFString:sourceURL] toURL:[NSURL _web_URLWithWTFString:destinationURL]];
+}
+
+void NavigationState::LoaderClient::didUpdateHistoryTitle(WebKit::WebPageProxy&, const WTF::String& title, const WTF::String& url, WebKit::WebFrameProxy& webFrameProxy)
+{
+ if (!webFrameProxy.isMainFrame())
+ return;
+
+ if (!m_navigationState.m_historyDelegateMethods.webViewDidUpdateHistoryTitleForURL)
+ return;
+
+ auto historyDelegate = m_navigationState.m_historyDelegate.get();
+ if (!historyDelegate)
+ return;
+
+ [historyDelegate _webView:m_navigationState.m_webView didUpdateHistoryTitle:title forURL:[NSURL _web_URLWithWTFString:url]];
+}
+
</ins><span class="cx"> void NavigationState::willChangeIsLoading()
</span><span class="cx"> {
</span><span class="cx"> [m_webView willChangeValueForKey:@"loading"];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "APIDownloadClient.h"
</span><del>-#include "APIHistoryClient.h"
</del><ins>+#include "APILegacyContextHistoryClient.h"
</ins><span class="cx"> #include "CustomProtocolManagerMessages.h"
</span><span class="cx"> #include "DownloadProxy.h"
</span><span class="cx"> #include "DownloadProxyMessages.h"
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> , m_defaultPageGroup(WebPageGroup::createNonNull())
</span><span class="cx"> , m_injectedBundlePath(configuration.injectedBundlePath)
</span><span class="cx"> , m_downloadClient(std::make_unique<API::DownloadClient>())
</span><del>- , m_historyClient(std::make_unique<API::HistoryClient>())
</del><ins>+ , m_historyClient(std::make_unique<API::LegacyContextHistoryClient>())
</ins><span class="cx"> , m_visitedLinkProvider(VisitedLinkProvider::create())
</span><span class="cx"> , m_visitedLinksPopulated(false)
</span><span class="cx"> , m_plugInAutoStartProvider(this)
</span><span class="lines">@@ -306,10 +306,10 @@
</span><span class="cx"> m_connectionClient.initialize(client);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebContext::setHistoryClient(std::unique_ptr<API::HistoryClient> historyClient)
</del><ins>+void WebContext::setHistoryClient(std::unique_ptr<API::LegacyContextHistoryClient> historyClient)
</ins><span class="cx"> {
</span><span class="cx"> if (!historyClient)
</span><del>- m_historyClient = std::make_unique<API::HistoryClient>();
</del><ins>+ m_historyClient = std::make_unique<API::LegacyContextHistoryClient>();
</ins><span class="cx"> else
</span><span class="cx"> m_historyClient = WTF::move(historyClient);
</span><span class="cx"> }
</span><span class="lines">@@ -965,7 +965,7 @@
</span><span class="cx">
</span><span class="cx"> void WebContext::populateVisitedLinks()
</span><span class="cx"> {
</span><del>- m_historyClient->populateVisitedLinks(this);
</del><ins>+ m_historyClient->populateVisitedLinks(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebContext::Statistics& WebContext::statistics()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx"> class DownloadClient;
</span><del>-class HistoryClient;
</del><ins>+class LegacyContextHistoryClient;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> void initializeClient(const WKContextClientBase*);
</span><span class="cx"> void initializeInjectedBundleClient(const WKContextInjectedBundleClientBase*);
</span><span class="cx"> void initializeConnectionClient(const WKContextConnectionClientBase*);
</span><del>- void setHistoryClient(std::unique_ptr<API::HistoryClient>);
</del><ins>+ void setHistoryClient(std::unique_ptr<API::LegacyContextHistoryClient>);
</ins><span class="cx"> void setDownloadClient(std::unique_ptr<API::DownloadClient>);
</span><span class="cx">
</span><span class="cx"> void setProcessModel(ProcessModel); // Can only be called when there are no processes running.
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> DownloadProxy* createDownloadProxy(const WebCore::ResourceRequest&);
</span><span class="cx"> API::DownloadClient& downloadClient() { return *m_downloadClient; }
</span><span class="cx">
</span><del>- API::HistoryClient& historyClient() { return *m_historyClient; }
</del><ins>+ API::LegacyContextHistoryClient& historyClient() { return *m_historyClient; }
</ins><span class="cx"> WebContextClient& client() { return m_client; }
</span><span class="cx">
</span><span class="cx"> WebIconDatabase* iconDatabase() const { return m_iconDatabase.get(); }
</span><span class="lines">@@ -479,7 +479,7 @@
</span><span class="cx"> WebContextClient m_client;
</span><span class="cx"> WebContextConnectionClient m_connectionClient;
</span><span class="cx"> std::unique_ptr<API::DownloadClient> m_downloadClient;
</span><del>- std::unique_ptr<API::HistoryClient> m_historyClient;
</del><ins>+ std::unique_ptr<API::LegacyContextHistoryClient> m_historyClient;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> PluginInfoStore m_pluginInfoStore;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "APIFindClient.h"
</span><span class="cx"> #include "APIFormClient.h"
</span><ins>+#include "APILegacyContextHistoryClient.h"
</ins><span class="cx"> #include "APILoaderClient.h"
</span><span class="cx"> #include "APIPolicyClient.h"
</span><span class="cx"> #include "APIUIClient.h"
</span><span class="lines">@@ -3071,6 +3072,60 @@
</span><span class="cx"> listener->continueSubmission();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::didNavigateWithNavigationData(const WebNavigationDataStore& store, uint64_t frameID)
+{
+ WebFrameProxy* frame = m_process->webFrame(frameID);
+ MESSAGE_CHECK(frame);
+ MESSAGE_CHECK(frame->page() == this);
+
+ m_loaderClient->didNavigateWithNavigationData(*this, store, *frame);
+ process().context().historyClient().didNavigateWithNavigationData(process().context(), *this, store, *frame);
+}
+
+void WebPageProxy::didPerformClientRedirect(const String& sourceURLString, const String& destinationURLString, uint64_t frameID)
+{
+ if (sourceURLString.isEmpty() || destinationURLString.isEmpty())
+ return;
+
+ WebFrameProxy* frame = m_process->webFrame(frameID);
+ MESSAGE_CHECK(frame);
+ MESSAGE_CHECK(frame->page() == this);
+
+ MESSAGE_CHECK_URL(sourceURLString);
+ MESSAGE_CHECK_URL(destinationURLString);
+
+ m_loaderClient->didPerformClientRedirect(*this, sourceURLString, destinationURLString, *frame);
+ process().context().historyClient().didPerformClientRedirect(process().context(), *this, sourceURLString, destinationURLString, *frame);
+}
+
+void WebPageProxy::didPerformServerRedirect(const String& sourceURLString, const String& destinationURLString, uint64_t frameID)
+{
+ if (sourceURLString.isEmpty() || destinationURLString.isEmpty())
+ return;
+
+ WebFrameProxy* frame = m_process->webFrame(frameID);
+ MESSAGE_CHECK(frame);
+ MESSAGE_CHECK(frame->page() == this);
+
+ MESSAGE_CHECK_URL(sourceURLString);
+ MESSAGE_CHECK_URL(destinationURLString);
+
+ m_loaderClient->didPerformServerRedirect(*this, sourceURLString, destinationURLString, *frame);
+ process().context().historyClient().didPerformServerRedirect(process().context(), *this, sourceURLString, destinationURLString, *frame);
+}
+
+void WebPageProxy::didUpdateHistoryTitle(const String& title, const String& url, uint64_t frameID)
+{
+ WebFrameProxy* frame = m_process->webFrame(frameID);
+ MESSAGE_CHECK(frame);
+ MESSAGE_CHECK(frame->page() == this);
+
+ MESSAGE_CHECK_URL(url);
+
+ m_loaderClient->didUpdateHistoryTitle(*this, title, url, *frame);
+ process().context().historyClient().didUpdateHistoryTitle(process().context(), *this, title, url, *frame);
+}
+
</ins><span class="cx"> // UIClient
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::createNewPage(uint64_t frameID, const ResourceRequest& request, const WindowFeatures& windowFeatures, const NavigationActionData& navigationActionData, uint64_t& newPageID, WebPageCreationParameters& newPageParameters)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -1028,6 +1028,12 @@
</span><span class="cx">
</span><span class="cx"> void willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String>>& textFieldValues, uint64_t listenerID, IPC::MessageDecoder&);
</span><span class="cx">
</span><ins>+ // History client
+ void didNavigateWithNavigationData(const WebNavigationDataStore&, uint64_t frameID);
+ void didPerformClientRedirect(const String& sourceURLString, const String& destinationURLString, uint64_t frameID);
+ void didPerformServerRedirect(const String& sourceURLString, const String& destinationURLString, uint64_t frameID);
+ void didUpdateHistoryTitle(const String& title, const String& url, uint64_t frameID);
+
</ins><span class="cx"> // UI client
</span><span class="cx"> void createNewPage(uint64_t frameID, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const NavigationActionData&, uint64_t& newPageID, WebPageCreationParameters&);
</span><span class="cx"> void showPage();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -151,6 +151,12 @@
</span><span class="cx">
</span><span class="cx"> FrameDidBecomeFrameSet(uint64_t frameID, bool value)
</span><span class="cx">
</span><ins>+ # History client messages.
+ DidNavigateWithNavigationData(struct WebKit::WebNavigationDataStore store, uint64_t frameID)
+ DidPerformClientRedirect(String sourceURLString, String destinationURLString, uint64_t frameID)
+ DidPerformServerRedirect(String sourceURLString, String destinationURLString, uint64_t frameID)
+ DidUpdateHistoryTitle(String title, String url, uint64_t frameID)
+
</ins><span class="cx"> # Custom representations
</span><span class="cx"> DidFinishLoadingDataForCustomContentProvider(String suggestedFilename, IPC::DataReference data)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "WebProcessProxy.h"
</span><span class="cx">
</span><span class="cx"> #include "APIFrameHandle.h"
</span><del>-#include "APIHistoryClient.h"
</del><span class="cx"> #include "CustomProtocolManagerProxyMessages.h"
</span><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "DownloadProxyMap.h"
</span><span class="lines">@@ -600,69 +599,6 @@
</span><span class="cx"> return m_downloadProxyMap->createDownloadProxy(m_context, request);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessProxy::didNavigateWithNavigationData(uint64_t pageID, const WebNavigationDataStore& store, uint64_t frameID)
-{
- WebPageProxy* page = webPage(pageID);
- if (!page)
- return;
-
- WebFrameProxy* frame = webFrame(frameID);
- MESSAGE_CHECK(frame);
- MESSAGE_CHECK(frame->page() == page);
-
- m_context->historyClient().didNavigateWithNavigationData(m_context.ptr(), page, store, frame);
-}
-
-void WebProcessProxy::didPerformClientRedirect(uint64_t pageID, const String& sourceURLString, const String& destinationURLString, uint64_t frameID)
-{
- WebPageProxy* page = webPage(pageID);
- if (!page)
- return;
-
- if (sourceURLString.isEmpty() || destinationURLString.isEmpty())
- return;
-
- WebFrameProxy* frame = webFrame(frameID);
- MESSAGE_CHECK(frame);
- MESSAGE_CHECK(frame->page() == page);
- MESSAGE_CHECK_URL(sourceURLString);
- MESSAGE_CHECK_URL(destinationURLString);
-
- m_context->historyClient().didPerformClientRedirect(m_context.ptr(), page, sourceURLString, destinationURLString, frame);
-}
-
-void WebProcessProxy::didPerformServerRedirect(uint64_t pageID, const String& sourceURLString, const String& destinationURLString, uint64_t frameID)
-{
- WebPageProxy* page = webPage(pageID);
- if (!page)
- return;
-
- if (sourceURLString.isEmpty() || destinationURLString.isEmpty())
- return;
-
- WebFrameProxy* frame = webFrame(frameID);
- MESSAGE_CHECK(frame);
- MESSAGE_CHECK(frame->page() == page);
- MESSAGE_CHECK_URL(sourceURLString);
- MESSAGE_CHECK_URL(destinationURLString);
-
- m_context->historyClient().didPerformServerRedirect(m_context.ptr(), page, sourceURLString, destinationURLString, frame);
-}
-
-void WebProcessProxy::didUpdateHistoryTitle(uint64_t pageID, const String& title, const String& url, uint64_t frameID)
-{
- WebPageProxy* page = webPage(pageID);
- if (!page)
- return;
-
- WebFrameProxy* frame = webFrame(frameID);
- MESSAGE_CHECK(frame);
- MESSAGE_CHECK(frame->page() == page);
- MESSAGE_CHECK_URL(url);
-
- m_context->historyClient().didUpdateHistoryTitle(m_context.ptr(), page, title, url, frame);
-}
-
</del><span class="cx"> void WebProcessProxy::didSaveToPageCache()
</span><span class="cx"> {
</span><span class="cx"> m_context->processDidCachePage(this);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -187,12 +187,6 @@
</span><span class="cx"> // ProcessLauncher::Client
</span><span class="cx"> virtual void didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier) override;
</span><span class="cx">
</span><del>- // History client
- void didNavigateWithNavigationData(uint64_t pageID, const WebNavigationDataStore&, uint64_t frameID);
- void didPerformClientRedirect(uint64_t pageID, const String& sourceURLString, const String& destinationURLString, uint64_t frameID);
- void didPerformServerRedirect(uint64_t pageID, const String& sourceURLString, const String& destinationURLString, uint64_t frameID);
- void didUpdateHistoryTitle(uint64_t pageID, const String& title, const String& url, uint64_t frameID);
-
</del><span class="cx"> // Implemented in generated WebProcessProxyMessageReceiver.cpp
</span><span class="cx"> void didReceiveWebProcessProxyMessage(IPC::Connection*, IPC::MessageDecoder&);
</span><span class="cx"> void didReceiveSyncWebProcessProxyMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -21,13 +21,6 @@
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><span class="cx"> messages -> WebProcessProxy LegacyReceiver {
</span><del>-
- # History client messages.
- DidNavigateWithNavigationData(uint64_t pageID, struct WebKit::WebNavigationDataStore store, uint64_t frameID)
- DidPerformClientRedirect(uint64_t pageID, String sourceURLString, String destinationURLString, uint64_t frameID)
- DidPerformServerRedirect(uint64_t pageID, String sourceURLString, String destinationURLString, uint64_t frameID)
- DidUpdateHistoryTitle(uint64_t pageID, String title, String url, uint64_t frameID)
-
</del><span class="cx"> AddBackForwardItem(uint64_t itemID, uint64_t pageID, struct WebKit::PageState pageState)
</span><span class="cx"> DidDestroyFrame(uint64_t frameID)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -231,8 +231,6 @@
</span><span class="cx"> 1A3EED0F161A535400AEB4F5 /* MessageReceiverMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3EED0D161A535300AEB4F5 /* MessageReceiverMap.h */; };
</span><span class="cx"> 1A3EED12161A53D600AEB4F5 /* MessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3EED11161A53D600AEB4F5 /* MessageReceiver.h */; };
</span><span class="cx"> 1A422F8B18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A422F8A18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 1A422F8E18B29C6400D8CD96 /* HistoryClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A422F8C18B29C6400D8CD96 /* HistoryClient.mm */; };
- 1A422F8F18B29C6400D8CD96 /* HistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A422F8D18B29C6400D8CD96 /* HistoryClient.h */; };
</del><span class="cx"> 1A433F0D113C53DD00FACDE9 /* WebErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A433F0C113C53DD00FACDE9 /* WebErrors.h */; };
</span><span class="cx"> 1A43E829188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A43E827188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm */; };
</span><span class="cx"> 1A43E82A188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A43E828188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -277,7 +275,6 @@
</span><span class="cx"> 1A64245E12DE29A100CAAE2C /* UpdateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A64245C12DE29A100CAAE2C /* UpdateInfo.h */; };
</span><span class="cx"> 1A64245F12DE29A100CAAE2C /* UpdateInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A64245D12DE29A100CAAE2C /* UpdateInfo.cpp */; };
</span><span class="cx"> 1A6509CE18B4146200614332 /* WKProcessPoolPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6509CD18B4146200614332 /* WKProcessPoolPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 1A6637D718B2831F00C0BCF3 /* APIHistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6637D618B2831F00C0BCF3 /* APIHistoryClient.h */; };
</del><span class="cx"> 1A66BF8F18A052ED002071B4 /* WKWebViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */; };
</span><span class="cx"> 1A6F9F9011E13EFC00DB1371 /* CommandLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */; };
</span><span class="cx"> 1A6F9FB711E1408500DB1371 /* CommandLinePOSIX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6F9FB611E1408500DB1371 /* CommandLinePOSIX.cpp */; };
</span><span class="lines">@@ -1081,6 +1078,7 @@
</span><span class="cx"> 7CD5EBBF1746B04C000C1C45 /* WKTypeRefWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBBD1746B04C000C1C45 /* WKTypeRefWrapper.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7CD622771739D863005BD7FF /* PluginSandboxProfile.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CD622751739D863005BD7FF /* PluginSandboxProfile.mm */; };
</span><span class="cx"> 7CD622781739D863005BD7FF /* PluginSandboxProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD622761739D863005BD7FF /* PluginSandboxProfile.h */; };
</span><ins>+ 7CE4D2071A46776100C7F152 /* APILegacyContextHistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CE4D2061A46775700C7F152 /* APILegacyContextHistoryClient.h */; };
</ins><span class="cx"> 7CF47FF617275B71008ACB91 /* WKBundlePageBanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CF47FF417275B71008ACB91 /* WKBundlePageBanner.cpp */; };
</span><span class="cx"> 7CF47FF717275B71008ACB91 /* WKBundlePageBanner.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CF47FF517275B71008ACB91 /* WKBundlePageBanner.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7CF47FFB17275C57008ACB91 /* PageBanner.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CF47FF917275C57008ACB91 /* PageBanner.h */; };
</span><span class="lines">@@ -2226,8 +2224,6 @@
</span><span class="cx"> 1A3EED0D161A535300AEB4F5 /* MessageReceiverMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageReceiverMap.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A3EED11161A53D600AEB4F5 /* MessageReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageReceiver.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A422F8A18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHistoryDelegatePrivate.h; sourceTree = "<group>"; };
</span><del>- 1A422F8C18B29C6400D8CD96 /* HistoryClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HistoryClient.mm; sourceTree = "<group>"; };
- 1A422F8D18B29C6400D8CD96 /* HistoryClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryClient.h; sourceTree = "<group>"; };
</del><span class="cx"> 1A433F0C113C53DD00FACDE9 /* WebErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebErrors.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A43E827188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKProcessPoolConfiguration.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A43E828188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKProcessPoolConfiguration.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -2280,7 +2276,6 @@
</span><span class="cx"> 1A64245C12DE29A100CAAE2C /* UpdateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UpdateInfo.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A64245D12DE29A100CAAE2C /* UpdateInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UpdateInfo.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A6509CD18B4146200614332 /* WKProcessPoolPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessPoolPrivate.h; sourceTree = "<group>"; };
</span><del>- 1A6637D618B2831F00C0BCF3 /* APIHistoryClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIHistoryClient.h; sourceTree = "<group>"; };
</del><span class="cx"> 1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandLine.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A6F9FB611E1408500DB1371 /* CommandLinePOSIX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLinePOSIX.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -3176,6 +3171,7 @@
</span><span class="cx"> 7CD5EBBD1746B04C000C1C45 /* WKTypeRefWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKTypeRefWrapper.h; sourceTree = "<group>"; };
</span><span class="cx"> 7CD622751739D863005BD7FF /* PluginSandboxProfile.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginSandboxProfile.mm; sourceTree = "<group>"; };
</span><span class="cx"> 7CD622761739D863005BD7FF /* PluginSandboxProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginSandboxProfile.h; sourceTree = "<group>"; };
</span><ins>+ 7CE4D2061A46775700C7F152 /* APILegacyContextHistoryClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = APILegacyContextHistoryClient.h; sourceTree = "<group>"; };
</ins><span class="cx"> 7CF47FF417275B71008ACB91 /* WKBundlePageBanner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKBundlePageBanner.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7CF47FF517275B71008ACB91 /* WKBundlePageBanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePageBanner.h; sourceTree = "<group>"; };
</span><span class="cx"> 7CF47FF917275C57008ACB91 /* PageBanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageBanner.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4712,8 +4708,6 @@
</span><span class="cx"> A1DF631018E0B7C8003A3E2A /* DownloadClient.mm */,
</span><span class="cx"> 00B9661818E25AE100CE1F88 /* FindClient.h */,
</span><span class="cx"> 00B9661718E25AE100CE1F88 /* FindClient.mm */,
</span><del>- 1A422F8D18B29C6400D8CD96 /* HistoryClient.h */,
- 1A422F8C18B29C6400D8CD96 /* HistoryClient.mm */,
</del><span class="cx"> 0F0C365918C0555800F607D7 /* LayerRepresentation.h */,
</span><span class="cx"> 1ABC3DF41899E437004F0626 /* NavigationState.h */,
</span><span class="cx"> 1ABC3DF31899E437004F0626 /* NavigationState.mm */,
</span><span class="lines">@@ -6044,7 +6038,7 @@
</span><span class="cx"> 1F7D36C018DA513F00D9D659 /* APIDownloadClient.h */,
</span><span class="cx"> 00B9661518E24CBA00CE1F88 /* APIFindClient.h */,
</span><span class="cx"> 37E25D6D18FDE5D6005D3A00 /* APIFormClient.h */,
</span><del>- 1A6637D618B2831F00C0BCF3 /* APIHistoryClient.h */,
</del><ins>+ 7CE4D2061A46775700C7F152 /* APILegacyContextHistoryClient.h */,
</ins><span class="cx"> 1A2464F21891E45100234C5B /* APILoaderClient.h */,
</span><span class="cx"> 1AFDD3141891B54000153970 /* APIPolicyClient.h */,
</span><span class="cx"> 1AFDE65F1954E9B100C48FFA /* APISessionState.cpp */,
</span><span class="lines">@@ -7273,7 +7267,6 @@
</span><span class="cx"> 1ABC3DF11899C6B6004F0626 /* WKNavigationInternal.h in Headers */,
</span><span class="cx"> 0F0C365A18C0555800F607D7 /* LayerRepresentation.h in Headers */,
</span><span class="cx"> 1F604BA81889FA7400EE0395 /* WKRenderingProgressEvents.h in Headers */,
</span><del>- 1A422F8F18B29C6400D8CD96 /* HistoryClient.h in Headers */,
</del><span class="cx"> BCBAACEB145225E30053F82F /* WKProcessGroup.h in Headers */,
</span><span class="cx"> 2DAF06D618BD1A470081CEB1 /* SmartMagnificationController.h in Headers */,
</span><span class="cx"> 377EAD4817E2C77B002D193D /* WKUserContentInjectedFrames.h in Headers */,
</span><span class="lines">@@ -7356,7 +7349,6 @@
</span><span class="cx"> 935EEBA2127761D0003322B8 /* InjectedBundleBackForwardList.h in Headers */,
</span><span class="cx"> 935EEBA4127761D6003322B8 /* InjectedBundleBackForwardListItem.h in Headers */,
</span><span class="cx"> E164A2F2191AF14E0010737D /* BlobDataFileReferenceWithSandboxExtension.h in Headers */,
</span><del>- 1A6637D718B2831F00C0BCF3 /* APIHistoryClient.h in Headers */,
</del><span class="cx"> BCEE7DC5128B645D009827DA /* InjectedBundleClient.h in Headers */,
</span><span class="cx"> BC498618124D10E200D834E1 /* InjectedBundleHitTestResult.h in Headers */,
</span><span class="cx"> 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */,
</span><span class="lines">@@ -7631,6 +7623,7 @@
</span><span class="cx"> 330934501315B94D0097A7BC /* WebCookieManager.h in Headers */,
</span><span class="cx"> 330934481315B9220097A7BC /* WebCookieManagerMessages.h in Headers */,
</span><span class="cx"> 330934561315B9750097A7BC /* WebCookieManagerProxy.h in Headers */,
</span><ins>+ 7CE4D2071A46776100C7F152 /* APILegacyContextHistoryClient.h in Headers */,
</ins><span class="cx"> 515E772C184008B90007203F /* DatabaseProcessCreationParameters.h in Headers */,
</span><span class="cx"> 33AA1067131F060000D4A575 /* WebCookieManagerProxyClient.h in Headers */,
</span><span class="cx"> 3309344A1315B9220097A7BC /* WebCookieManagerProxyMessages.h in Headers */,
</span><span class="lines">@@ -9356,7 +9349,6 @@
</span><span class="cx"> CD73BA53131B645B00EEDED2 /* WebFullScreenManager.cpp in Sources */,
</span><span class="cx"> 755422BD18062BB20046F6A8 /* WKOriginDataManager.cpp in Sources */,
</span><span class="cx"> CD73BA4E131ACDB700EEDED2 /* WebFullScreenManagerMessageReceiver.cpp in Sources */,
</span><del>- 1A422F8E18B29C6400D8CD96 /* HistoryClient.mm in Sources */,
</del><span class="cx"> 1FB00AC8185F76460019142E /* WKWebProcessPlugInPageGroup.mm in Sources */,
</span><span class="cx"> CD6F75F4131B66D000D6B21E /* WebFullScreenManagerProxy.cpp in Sources */,
</span><span class="cx"> 1AD60F5D18E20F4C0020C034 /* WKWindowFeatures.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (177635 => 177636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-12-22 18:40:17 UTC (rev 177635)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-12-22 19:04:45 UTC (rev 177636)
</span><span class="lines">@@ -51,7 +51,6 @@
</span><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include "WebPageProxyMessages.h"
</span><span class="cx"> #include "WebProcess.h"
</span><del>-#include "WebProcessProxyMessages.h"
</del><span class="cx"> #include <JavaScriptCore/APICast.h>
</span><span class="cx"> #include <JavaScriptCore/JSObject.h>
</span><span class="cx"> #include <WebCore/CertificateInfo.h>
</span><span class="lines">@@ -954,7 +953,7 @@
</span><span class="cx"> data.originalRequest = loader->originalRequestCopy();
</span><span class="cx"> data.response = loader->response();
</span><span class="cx">
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebProcessProxy::DidNavigateWithNavigationData(webPage->pageID(), data, m_frame->frameID()), 0);
</del><ins>+ webPage->send(Messages::WebPageProxy::DidNavigateWithNavigationData(data, m_frame->frameID()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::updateGlobalHistoryRedirectLinks()
</span><span class="lines">@@ -968,14 +967,14 @@
</span><span class="cx">
</span><span class="cx"> // Client redirect
</span><span class="cx"> if (!loader->clientRedirectSourceForHistory().isNull()) {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebProcessProxy::DidPerformClientRedirect(webPage->pageID(),
- loader->clientRedirectSourceForHistory(), loader->clientRedirectDestinationForHistory(), m_frame->frameID()), 0);
</del><ins>+ webPage->send(Messages::WebPageProxy::DidPerformClientRedirect(
+ loader->clientRedirectSourceForHistory(), loader->clientRedirectDestinationForHistory(), m_frame->frameID()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Server redirect
</span><span class="cx"> if (!loader->serverRedirectSourceForHistory().isNull()) {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebProcessProxy::DidPerformServerRedirect(webPage->pageID(),
- loader->serverRedirectSourceForHistory(), loader->serverRedirectDestinationForHistory(), m_frame->frameID()), 0);
</del><ins>+ webPage->send(Messages::WebPageProxy::DidPerformServerRedirect(
+ loader->serverRedirectSourceForHistory(), loader->serverRedirectDestinationForHistory(), m_frame->frameID()));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1206,8 +1205,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME: use direction of title.
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebProcessProxy::DidUpdateHistoryTitle(webPage->pageID(),
- title.string(), url.string(), m_frame->frameID()), 0);
</del><ins>+ webPage->send(Messages::WebPageProxy::DidUpdateHistoryTitle(title.string(), url.string(), m_frame->frameID()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebFrameLoaderClient::userAgent(const URL& url)
</span></span></pre>
</div>
</div>
</body>
</html>