<!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>[164230] 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/164230">164230</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-02-17 11:08:49 -0800 (Mon, 17 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Turn the history client into a fancy API::HistoryClient abstract base class
https://bugs.webkit.org/show_bug.cgi?id=128917
Reviewed by Andreas Kling.
* UIProcess/API/APIHistoryClient.h: Renamed from Source/WebKit2/UIProcess/WebHistoryClient.h.
(API::HistoryClient::~HistoryClient):
(API::HistoryClient::didNavigateWithNavigationData):
(API::HistoryClient::didPerformClientRedirect):
(API::HistoryClient::didPerformServerRedirect):
(API::HistoryClient::didUpdateHistoryTitle):
(API::HistoryClient::populateVisitedLinks):
(API::HistoryClient::shouldTrackVisitedLinks):
* UIProcess/API/C/WKContext.cpp:
(WKContextSetHistoryClient):
* UIProcess/WebContext.cpp:
(WebKit::WebContext::WebContext):
(WebKit::WebContext::setHistoryClient):
(WebKit::WebContext::createNewWebProcess):
(WebKit::WebContext::populateVisitedLinks):
* UIProcess/WebContext.h:
(WebKit::WebContext::historyClient):
* UIProcess/WebHistoryClient.cpp: Removed.
* UIProcess/WebPageProxy.h:
* UIProcess/WebProcessProxy.cpp:
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</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="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIHistoryClienth">trunk/Source/WebKit2/UIProcess/API/APIHistoryClient.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessWebHistoryClientcpp">trunk/Source/WebKit2/UIProcess/WebHistoryClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebHistoryClienth">trunk/Source/WebKit2/UIProcess/WebHistoryClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164229 => 164230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-17 19:00:03 UTC (rev 164229)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-17 19:08:49 UTC (rev 164230)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-02-17 Anders Carlsson <andersca@apple.com>
+
+ Turn the history client into a fancy API::HistoryClient abstract base class
+ https://bugs.webkit.org/show_bug.cgi?id=128917
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/API/APIHistoryClient.h: Renamed from Source/WebKit2/UIProcess/WebHistoryClient.h.
+ (API::HistoryClient::~HistoryClient):
+ (API::HistoryClient::didNavigateWithNavigationData):
+ (API::HistoryClient::didPerformClientRedirect):
+ (API::HistoryClient::didPerformServerRedirect):
+ (API::HistoryClient::didUpdateHistoryTitle):
+ (API::HistoryClient::populateVisitedLinks):
+ (API::HistoryClient::shouldTrackVisitedLinks):
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextSetHistoryClient):
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::WebContext):
+ (WebKit::WebContext::setHistoryClient):
+ (WebKit::WebContext::createNewWebProcess):
+ (WebKit::WebContext::populateVisitedLinks):
+ * UIProcess/WebContext.h:
+ (WebKit::WebContext::historyClient):
+ * UIProcess/WebHistoryClient.cpp: Removed.
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebProcessProxy.cpp:
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-02-17 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to fix iOS Debug builds without breaking Release builds.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIHistoryClienthfromrev164229trunkSourceWebKit2UIProcessWebHistoryClienth"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/APIHistoryClient.h (from rev 164229, trunk/Source/WebKit2/UIProcess/WebHistoryClient.h) (0 => 164230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIHistoryClient.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/APIHistoryClient.h 2014-02-17 19:08:49 UTC (rev 164230)
</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 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& sourceURL, const WTF::String& destinationURL, WebKit::WebFrameProxy*) { }
+ virtual void didPerformServerRedirect(WebKit::WebContext*, WebKit::WebPageProxy*, const WTF::String& sourceURL, const WTF::String& destinationURL, WebKit::WebFrameProxy*) { }
+ virtual void didUpdateHistoryTitle(WebKit::WebContext*, WebKit::WebPageProxy*, const WTF::String& title, const WTF::String& url, WebKit::WebFrameProxy*) { }
+ virtual void populateVisitedLinks(WebKit::WebContext*) { }
+ virtual bool shouldTrackVisitedLinks() const { return false; }
+};
+
+} // namespace API
+
+#endif // APIHistoryClient_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (164229 => 164230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-02-17 19:00:03 UTC (rev 164229)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-02-17 19:08:49 UTC (rev 164230)
</span><span class="lines">@@ -24,9 +24,11 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#include "WKContext.h"
</del><span class="cx"> #include "WKContextPrivate.h"
</span><span class="cx">
</span><ins>+#include "APIClient.h"
+#include "APIHistoryClient.h"
+#include "APINavigationData.h"
</ins><span class="cx"> #include "APIURLRequest.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WebContext.h"
</span><span class="lines">@@ -53,6 +55,12 @@
</span><span class="cx"> #include "WebNetworkInfoManagerProxy.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+namespace API {
+template<> struct ClientTraits<WKContextHistoryClientBase> {
+ typedef std::tuple<WKContextHistoryClientV0> Versions;
+};
+}
+
</ins><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> WKTypeID WKContextGetTypeID()
</span><span class="lines">@@ -84,7 +92,62 @@
</span><span class="cx">
</span><span class="cx"> void WKContextSetHistoryClient(WKContextRef contextRef, const WKContextHistoryClientBase* wkClient)
</span><span class="cx"> {
</span><del>- toImpl(contextRef)->initializeHistoryClient(wkClient);
</del><ins>+ class HistoryClient final : public API::Client<WKContextHistoryClientBase>, public API::HistoryClient {
+ public:
+ explicit HistoryClient(const WKContextHistoryClientBase* client)
+ {
+ initialize(client);
+ }
+
+ private:
+ virtual void didNavigateWithNavigationData(WebContext* context, WebPageProxy* page, const WebNavigationDataStore& navigationDataStore, WebFrameProxy* frame) override
+ {
+ if (!m_client.didNavigateWithNavigationData)
+ return;
+
+ RefPtr<API::NavigationData> navigationData = API::NavigationData::create(navigationDataStore);
+ m_client.didNavigateWithNavigationData(toAPI(context), toAPI(page), toAPI(navigationData.get()), toAPI(frame), m_client.base.clientInfo);
+ }
+
+ virtual void didPerformClientRedirect(WebContext* context, WebPageProxy* page, const String& sourceURL, const String& destinationURL, WebFrameProxy* frame) override
+ {
+ if (!m_client.didPerformClientRedirect)
+ return;
+
+ m_client.didPerformClientRedirect(toAPI(context), toAPI(page), toURLRef(sourceURL.impl()), toURLRef(destinationURL.impl()), toAPI(frame), m_client.base.clientInfo);
+ }
+
+ virtual void didPerformServerRedirect(WebContext* context, WebPageProxy* page, const String& sourceURL, const String& destinationURL, WebFrameProxy* frame) override
+ {
+ if (!m_client.didPerformServerRedirect)
+ return;
+
+ m_client.didPerformServerRedirect(toAPI(context), toAPI(page), toURLRef(sourceURL.impl()), toURLRef(destinationURL.impl()), toAPI(frame), m_client.base.clientInfo);
+ }
+
+ virtual void didUpdateHistoryTitle(WebContext* context, WebPageProxy* page, const String& title, const String& url, WebFrameProxy* frame) override
+ {
+ if (!m_client.didUpdateHistoryTitle)
+ return;
+
+ m_client.didUpdateHistoryTitle(toAPI(context), toAPI(page), toAPI(title.impl()), toURLRef(url.impl()), toAPI(frame), m_client.base.clientInfo);
+ }
+
+ virtual void populateVisitedLinks(WebContext* context) override
+ {
+ if (!m_client.populateVisitedLinks)
+ return;
+
+ m_client.populateVisitedLinks(toAPI(context), m_client.base.clientInfo);
+ }
+
+ virtual bool shouldTrackVisitedLinks() const
+ {
+ return m_client.populateVisitedLinks;
+ }
+ };
+
+ toImpl(contextRef)->setHistoryClient(std::make_unique<HistoryClient>(wkClient));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKContextSetDownloadClient(WKContextRef contextRef, const WKContextDownloadClientBase* wkClient)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (164229 => 164230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-02-17 19:00:03 UTC (rev 164229)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-02-17 19:08:49 UTC (rev 164230)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "WebContext.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APIHistoryClient.h"
</ins><span class="cx"> #include "DownloadProxy.h"
</span><span class="cx"> #include "DownloadProxyMessages.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="lines">@@ -135,6 +136,7 @@
</span><span class="cx"> , m_processWithPageCache(0)
</span><span class="cx"> , m_defaultPageGroup(WebPageGroup::createNonNull())
</span><span class="cx"> , m_injectedBundlePath(injectedBundlePath)
</span><ins>+ , m_historyClient(std::make_unique<API::HistoryClient>())
</ins><span class="cx"> , m_visitedLinkProvider(this)
</span><span class="cx"> , m_plugInAutoStartProvider(this)
</span><span class="cx"> , m_alwaysUsesComplexTextCodePath(false)
</span><span class="lines">@@ -269,11 +271,14 @@
</span><span class="cx"> m_connectionClient.initialize(client);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebContext::initializeHistoryClient(const WKContextHistoryClientBase* client)
</del><ins>+void WebContext::setHistoryClient(std::unique_ptr<API::HistoryClient> historyClient)
</ins><span class="cx"> {
</span><del>- m_historyClient.initialize(client);
</del><ins>+ if (!historyClient)
+ m_historyClient = std::make_unique<API::HistoryClient>();
+ else
+ m_historyClient = std::move(historyClient);
</ins><span class="cx">
</span><del>- sendToAllProcesses(Messages::WebProcess::SetShouldTrackVisitedLinks(m_historyClient.shouldTrackVisitedLinks()));
</del><ins>+ sendToAllProcesses(Messages::WebProcess::SetShouldTrackVisitedLinks(m_historyClient->shouldTrackVisitedLinks()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContext::initializeDownloadClient(const WKContextDownloadClientBase* client)
</span><span class="lines">@@ -565,7 +570,7 @@
</span><span class="cx">
</span><span class="cx"> parameters.shouldUseTestingNetworkSession = m_shouldUseTestingNetworkSession;
</span><span class="cx">
</span><del>- parameters.shouldTrackVisitedLinks = m_historyClient.shouldTrackVisitedLinks();
</del><ins>+ parameters.shouldTrackVisitedLinks = m_historyClient->shouldTrackVisitedLinks();
</ins><span class="cx"> parameters.cacheModel = m_cacheModel;
</span><span class="cx"> parameters.languages = userPreferredLanguages();
</span><span class="cx">
</span><span class="lines">@@ -838,7 +843,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 (164229 => 164230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-02-17 19:00:03 UTC (rev 164229)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-02-17 19:08:49 UTC (rev 164230)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> #include "WebContextConnectionClient.h"
</span><span class="cx"> #include "WebContextInjectedBundleClient.h"
</span><span class="cx"> #include "WebDownloadClient.h"
</span><del>-#include "WebHistoryClient.h"
</del><span class="cx"> #include "WebProcessProxy.h"
</span><span class="cx"> #include <WebCore/LinkHash.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -66,6 +65,10 @@
</span><span class="cx"> OBJC_CLASS NSString;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+namespace API {
+class HistoryClient;
+}
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class DownloadProxy;
</span><span class="lines">@@ -128,7 +131,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 initializeHistoryClient(const WKContextHistoryClientBase*);
</del><ins>+ void setHistoryClient(std::unique_ptr<API::HistoryClient>);
</ins><span class="cx"> void initializeDownloadClient(const WKContextDownloadClientBase*);
</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">@@ -217,7 +220,7 @@
</span><span class="cx"> DownloadProxy* createDownloadProxy();
</span><span class="cx"> WebDownloadClient& downloadClient() { return m_downloadClient; }
</span><span class="cx">
</span><del>- WebHistoryClient& historyClient() { return m_historyClient; }
</del><ins>+ API::HistoryClient& 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">@@ -440,7 +443,7 @@
</span><span class="cx"> WebContextClient m_client;
</span><span class="cx"> WebContextConnectionClient m_connectionClient;
</span><span class="cx"> WebDownloadClient m_downloadClient;
</span><del>- WebHistoryClient m_historyClient;
</del><ins>+ std::unique_ptr<API::HistoryClient> 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="trunkSourceWebKit2UIProcessWebHistoryClientcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebHistoryClient.cpp (164229 => 164230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebHistoryClient.cpp 2014-02-17 19:00:03 UTC (rev 164229)
+++ trunk/Source/WebKit2/UIProcess/WebHistoryClient.cpp 2014-02-17 19:08:49 UTC (rev 164230)
</span><span class="lines">@@ -1,78 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 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 "config.h"
-#include "WebHistoryClient.h"
-
-#include "APINavigationData.h"
-#include "WKAPICast.h"
-#include <wtf/RefPtr.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-void WebHistoryClient::didNavigateWithNavigationData(WebContext* context, WebPageProxy* page, const WebNavigationDataStore& navigationDataStore, WebFrameProxy* frame)
-{
- if (!m_client.didNavigateWithNavigationData)
- return;
-
- RefPtr<API::NavigationData> navigationData = API::NavigationData::create(navigationDataStore);
- m_client.didNavigateWithNavigationData(toAPI(context), toAPI(page), toAPI(navigationData.get()), toAPI(frame), m_client.base.clientInfo);
-}
-
-void WebHistoryClient::didPerformClientRedirect(WebContext* context, WebPageProxy* page, const String& sourceURL, const String& destinationURL, WebFrameProxy* frame)
-{
- if (!m_client.didPerformClientRedirect)
- return;
-
- m_client.didPerformClientRedirect(toAPI(context), toAPI(page), toURLRef(sourceURL.impl()), toURLRef(destinationURL.impl()), toAPI(frame), m_client.base.clientInfo);
-}
-
-void WebHistoryClient::didPerformServerRedirect(WebContext* context, WebPageProxy* page, const String& sourceURL, const String& destinationURL, WebFrameProxy* frame)
-{
- if (!m_client.didPerformServerRedirect)
- return;
-
- m_client.didPerformServerRedirect(toAPI(context), toAPI(page), toURLRef(sourceURL.impl()), toURLRef(destinationURL.impl()), toAPI(frame), m_client.base.clientInfo);
-}
-
-void WebHistoryClient::didUpdateHistoryTitle(WebContext* context, WebPageProxy* page, const String& title, const String& url, WebFrameProxy* frame)
-{
- if (!m_client.didUpdateHistoryTitle)
- return;
-
- m_client.didUpdateHistoryTitle(toAPI(context), toAPI(page), toAPI(title.impl()), toURLRef(url.impl()), toAPI(frame), m_client.base.clientInfo);
-}
-
-void WebHistoryClient::populateVisitedLinks(WebContext* context)
-{
- if (!m_client.populateVisitedLinks)
- return;
-
- m_client.populateVisitedLinks(toAPI(context), m_client.base.clientInfo);
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebHistoryClienth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebHistoryClient.h (164229 => 164230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebHistoryClient.h 2014-02-17 19:00:03 UTC (rev 164229)
+++ trunk/Source/WebKit2/UIProcess/WebHistoryClient.h 2014-02-17 19:08:49 UTC (rev 164230)
</span><span class="lines">@@ -1,59 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 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 WebHistoryClient_h
-#define WebHistoryClient_h
-
-#include "APIClient.h"
-#include "WKContext.h"
-#include <wtf/Forward.h>
-
-namespace API {
-template<> struct ClientTraits<WKContextHistoryClientBase> {
- typedef std::tuple<WKContextHistoryClientV0> Versions;
-};
-}
-
-namespace WebKit {
-
-class WebContext;
-class WebFrameProxy;
-class WebPageProxy;
-struct WebNavigationDataStore;
-
-class WebHistoryClient : public API::Client<WKContextHistoryClientBase> {
-public:
- void didNavigateWithNavigationData(WebContext*, WebPageProxy*, const WebNavigationDataStore&, WebFrameProxy*);
- void didPerformClientRedirect(WebContext*, WebPageProxy*, const String& sourceURL, const String& destinationURL, WebFrameProxy*);
- void didPerformServerRedirect(WebContext*, WebPageProxy*, const String& sourceURL, const String& destinationURL, WebFrameProxy*);
- void didUpdateHistoryTitle(WebContext*, WebPageProxy*, const String& title, const String& url, WebFrameProxy*);
- void populateVisitedLinks(WebContext*);
-
- bool shouldTrackVisitedLinks() const { return m_client.populateVisitedLinks; }
-};
-
-} // namespace WebKit
-
-#endif // WebHistoryClient_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (164229 => 164230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-17 19:00:03 UTC (rev 164229)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-17 19:08:49 UTC (rev 164230)
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> #include "WebFindClient.h"
</span><span class="cx"> #include "WebFormClient.h"
</span><span class="cx"> #include "WebFrameProxy.h"
</span><del>-#include "WebHistoryClient.h"
</del><span class="cx"> #include "WebHitTestResult.h"
</span><span class="cx"> #include "WebPageContextMenuClient.h"
</span><span class="cx"> #include "WebPageCreationParameters.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (164229 => 164230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-02-17 19:00:03 UTC (rev 164229)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-02-17 19:08:49 UTC (rev 164230)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "WebProcessProxy.h"
</span><span class="cx">
</span><span class="cx"> #include "APIFrameHandle.h"
</span><ins>+#include "APIHistoryClient.h"
</ins><span class="cx"> #include "CustomProtocolManagerProxyMessages.h"
</span><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "DownloadProxyMap.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (164229 => 164230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-17 19:00:03 UTC (rev 164229)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-17 19:08:49 UTC (rev 164230)
</span><span class="lines">@@ -199,6 +199,7 @@
</span><span class="cx"> 1A64230912DD09EB00CAAE2C /* DrawingAreaProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A64230712DD09EB00CAAE2C /* DrawingAreaProxyMessages.h */; };
</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><ins>+ 1A6637D718B2831F00C0BCF3 /* APIHistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6637D618B2831F00C0BCF3 /* APIHistoryClient.h */; };
</ins><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">@@ -1323,8 +1324,6 @@
</span><span class="cx"> BCF4DE23168E4BD500C94AFC /* NetworkProcessSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF4DE22168E4BD500C94AFC /* NetworkProcessSupplement.h */; };
</span><span class="cx"> BCF4DE25168FA44800C94AFC /* WebContextSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF4DE24168FA44800C94AFC /* WebContextSupplement.h */; };
</span><span class="cx"> BCF50728124329AA005955AE /* WebCertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF50726124329AA005955AE /* WebCertificateInfo.h */; };
</span><del>- BCF69F861176CD6F00471A52 /* WebHistoryClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF69F841176CD6F00471A52 /* WebHistoryClient.cpp */; };
- BCF69F871176CD6F00471A52 /* WebHistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69F851176CD6F00471A52 /* WebHistoryClient.h */; };
</del><span class="cx"> BCF69F9A1176CED600471A52 /* WebNavigationDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69F981176CED600471A52 /* WebNavigationDataStore.h */; };
</span><span class="cx"> BCF69FA21176D01400471A52 /* APINavigationData.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69FA01176D01400471A52 /* APINavigationData.h */; };
</span><span class="cx"> BCF69FA31176D01400471A52 /* APINavigationData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF69FA11176D01400471A52 /* APINavigationData.cpp */; };
</span><span class="lines">@@ -1870,6 +1869,7 @@
</span><span class="cx"> 1A64230712DD09EB00CAAE2C /* DrawingAreaProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaProxyMessages.h; sourceTree = "<group>"; };
</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><ins>+ 1A6637D618B2831F00C0BCF3 /* APIHistoryClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIHistoryClient.h; sourceTree = "<group>"; };
</ins><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">@@ -3105,8 +3105,6 @@
</span><span class="cx"> BCF4DE24168FA44800C94AFC /* WebContextSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextSupplement.h; sourceTree = "<group>"; };
</span><span class="cx"> BCF5068412431861005955AE /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
</span><span class="cx"> BCF50726124329AA005955AE /* WebCertificateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCertificateInfo.h; sourceTree = "<group>"; };
</span><del>- BCF69F841176CD6F00471A52 /* WebHistoryClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebHistoryClient.cpp; sourceTree = "<group>"; };
- BCF69F851176CD6F00471A52 /* WebHistoryClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHistoryClient.h; sourceTree = "<group>"; };
</del><span class="cx"> BCF69F981176CED600471A52 /* WebNavigationDataStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNavigationDataStore.h; sourceTree = "<group>"; };
</span><span class="cx"> BCF69FA01176D01400471A52 /* APINavigationData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APINavigationData.h; sourceTree = "<group>"; };
</span><span class="cx"> BCF69FA11176D01400471A52 /* APINavigationData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APINavigationData.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -5125,8 +5123,6 @@
</span><span class="cx"> BC0E615212D6CAC80012A72A /* WebGeolocationManagerProxy.messages.in */,
</span><span class="cx"> BC1BE1F112D54DBD0004A228 /* WebGeolocationProvider.cpp */,
</span><span class="cx"> BC1BE1F012D54DBD0004A228 /* WebGeolocationProvider.h */,
</span><del>- BCF69F841176CD6F00471A52 /* WebHistoryClient.cpp */,
- BCF69F851176CD6F00471A52 /* WebHistoryClient.h */,
</del><span class="cx"> 511B24A8132E097200065A0C /* WebIconDatabase.cpp */,
</span><span class="cx"> 511B24A9132E097200065A0C /* WebIconDatabase.h */,
</span><span class="cx"> 5184BC4A132E907A006B9E28 /* WebIconDatabase.messages.in */,
</span><span class="lines">@@ -5172,11 +5168,12 @@
</span><span class="cx"> BC032DC410F4387C0058C15A /* API */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><del>- 2DA944771884E3AB00ED86DB /* ios */,
</del><span class="cx"> BC0C376610F807660076D7CB /* C */,
</span><span class="cx"> 37C4C08318149C2A003688B9 /* Cocoa */,
</span><span class="cx"> BC8A501311765F4500757573 /* cpp */,
</span><ins>+ 2DA944771884E3AB00ED86DB /* ios */,
</ins><span class="cx"> BC111B47112F616900337BAB /* mac */,
</span><ins>+ 1A6637D618B2831F00C0BCF3 /* APIHistoryClient.h */,
</ins><span class="cx"> 1A2464F21891E45100234C5B /* APILoaderClient.h */,
</span><span class="cx"> 1AFDD3141891B54000153970 /* APIPolicyClient.h */,
</span><span class="cx"> 1A4D664718A2D91A00D82E21 /* APIUIClient.h */,
</span><span class="lines">@@ -6363,6 +6360,7 @@
</span><span class="cx"> 1ADCB86B189831B30022EE5A /* NavigationActionData.h in Headers */,
</span><span class="cx"> 935EEBA2127761D0003322B8 /* InjectedBundleBackForwardList.h in Headers */,
</span><span class="cx"> 935EEBA4127761D6003322B8 /* InjectedBundleBackForwardListItem.h in Headers */,
</span><ins>+ 1A6637D718B2831F00C0BCF3 /* APIHistoryClient.h in Headers */,
</ins><span class="cx"> BCEE7DC5128B645D009827DA /* InjectedBundleClient.h in Headers */,
</span><span class="cx"> BC498618124D10E200D834E1 /* InjectedBundleHitTestResult.h in Headers */,
</span><span class="cx"> 84477853176FCC0800CDC7BB /* InjectedBundleHitTestResultMediaType.h in Headers */,
</span><span class="lines">@@ -6639,7 +6637,6 @@
</span><span class="cx"> BC0E607312D6BC200012A72A /* WebGeolocationPosition.h in Headers */,
</span><span class="cx"> BC1BE1F212D54DBD0004A228 /* WebGeolocationProvider.h in Headers */,
</span><span class="cx"> 0F174AA3142A4CB70039250F /* APIGeometry.h in Headers */,
</span><del>- BCF69F871176CD6F00471A52 /* WebHistoryClient.h in Headers */,
</del><span class="cx"> 1A4D664818A2D91A00D82E21 /* APIUIClient.h in Headers */,
</span><span class="cx"> 7801C09A142290C400FAF9AF /* WebHitTestResult.h in Headers */,
</span><span class="cx"> 511B24AB132E097200065A0C /* WebIconDatabase.h in Headers */,
</span><span class="lines">@@ -8049,7 +8046,6 @@
</span><span class="cx"> BC0E618212D6CB1D0012A72A /* WebGeolocationManagerProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> BC0E607412D6BC200012A72A /* WebGeolocationPosition.cpp in Sources */,
</span><span class="cx"> BC1BE1F312D54DBD0004A228 /* WebGeolocationProvider.cpp in Sources */,
</span><del>- BCF69F861176CD6F00471A52 /* WebHistoryClient.cpp in Sources */,
</del><span class="cx"> 7801C099142290C400FAF9AF /* WebHitTestResult.cpp in Sources */,
</span><span class="cx"> 511B24AA132E097200065A0C /* WebIconDatabase.cpp in Sources */,
</span><span class="cx"> 51834592134532E90092B696 /* WebIconDatabaseClient.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>