Diff
Modified: trunk/Source/WebKit2/ChangeLog (164229 => 164230)
--- 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)
@@ -1,3 +1,32 @@
+2014-02-17 Anders Carlsson <[email protected]>
+
+ 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:
+
2014-02-17 Dan Bernstein <[email protected]>
Try to fix iOS Debug builds without breaking Release builds.
Copied: trunk/Source/WebKit2/UIProcess/API/APIHistoryClient.h (from rev 164229, trunk/Source/WebKit2/UIProcess/WebHistoryClient.h) (0 => 164230)
--- 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)
@@ -0,0 +1,54 @@
+/*
+ * 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
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (164229 => 164230)
--- 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)
@@ -24,9 +24,11 @@
*/
#include "config.h"
-#include "WKContext.h"
#include "WKContextPrivate.h"
+#include "APIClient.h"
+#include "APIHistoryClient.h"
+#include "APINavigationData.h"
#include "APIURLRequest.h"
#include "WKAPICast.h"
#include "WebContext.h"
@@ -53,6 +55,12 @@
#include "WebNetworkInfoManagerProxy.h"
#endif
+namespace API {
+template<> struct ClientTraits<WKContextHistoryClientBase> {
+ typedef std::tuple<WKContextHistoryClientV0> Versions;
+};
+}
+
using namespace WebKit;
WKTypeID WKContextGetTypeID()
@@ -84,7 +92,62 @@
void WKContextSetHistoryClient(WKContextRef contextRef, const WKContextHistoryClientBase* wkClient)
{
- toImpl(contextRef)->initializeHistoryClient(wkClient);
+ 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));
}
void WKContextSetDownloadClient(WKContextRef contextRef, const WKContextDownloadClientBase* wkClient)
Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (164229 => 164230)
--- 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)
@@ -27,6 +27,7 @@
#include "WebContext.h"
#include "APIArray.h"
+#include "APIHistoryClient.h"
#include "DownloadProxy.h"
#include "DownloadProxyMessages.h"
#include "Logging.h"
@@ -135,6 +136,7 @@
, m_processWithPageCache(0)
, m_defaultPageGroup(WebPageGroup::createNonNull())
, m_injectedBundlePath(injectedBundlePath)
+ , m_historyClient(std::make_unique<API::HistoryClient>())
, m_visitedLinkProvider(this)
, m_plugInAutoStartProvider(this)
, m_alwaysUsesComplexTextCodePath(false)
@@ -269,11 +271,14 @@
m_connectionClient.initialize(client);
}
-void WebContext::initializeHistoryClient(const WKContextHistoryClientBase* client)
+void WebContext::setHistoryClient(std::unique_ptr<API::HistoryClient> historyClient)
{
- m_historyClient.initialize(client);
+ if (!historyClient)
+ m_historyClient = std::make_unique<API::HistoryClient>();
+ else
+ m_historyClient = std::move(historyClient);
- sendToAllProcesses(Messages::WebProcess::SetShouldTrackVisitedLinks(m_historyClient.shouldTrackVisitedLinks()));
+ sendToAllProcesses(Messages::WebProcess::SetShouldTrackVisitedLinks(m_historyClient->shouldTrackVisitedLinks()));
}
void WebContext::initializeDownloadClient(const WKContextDownloadClientBase* client)
@@ -565,7 +570,7 @@
parameters.shouldUseTestingNetworkSession = m_shouldUseTestingNetworkSession;
- parameters.shouldTrackVisitedLinks = m_historyClient.shouldTrackVisitedLinks();
+ parameters.shouldTrackVisitedLinks = m_historyClient->shouldTrackVisitedLinks();
parameters.cacheModel = m_cacheModel;
parameters.languages = userPreferredLanguages();
@@ -838,7 +843,7 @@
void WebContext::populateVisitedLinks()
{
- m_historyClient.populateVisitedLinks(this);
+ m_historyClient->populateVisitedLinks(this);
}
WebContext::Statistics& WebContext::statistics()
Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (164229 => 164230)
--- 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)
@@ -42,7 +42,6 @@
#include "WebContextConnectionClient.h"
#include "WebContextInjectedBundleClient.h"
#include "WebDownloadClient.h"
-#include "WebHistoryClient.h"
#include "WebProcessProxy.h"
#include <WebCore/LinkHash.h>
#include <wtf/Forward.h>
@@ -66,6 +65,10 @@
OBJC_CLASS NSString;
#endif
+namespace API {
+class HistoryClient;
+}
+
namespace WebKit {
class DownloadProxy;
@@ -128,7 +131,7 @@
void initializeClient(const WKContextClientBase*);
void initializeInjectedBundleClient(const WKContextInjectedBundleClientBase*);
void initializeConnectionClient(const WKContextConnectionClientBase*);
- void initializeHistoryClient(const WKContextHistoryClientBase*);
+ void setHistoryClient(std::unique_ptr<API::HistoryClient>);
void initializeDownloadClient(const WKContextDownloadClientBase*);
void setProcessModel(ProcessModel); // Can only be called when there are no processes running.
@@ -217,7 +220,7 @@
DownloadProxy* createDownloadProxy();
WebDownloadClient& downloadClient() { return m_downloadClient; }
- WebHistoryClient& historyClient() { return m_historyClient; }
+ API::HistoryClient& historyClient() { return *m_historyClient; }
WebContextClient& client() { return m_client; }
WebIconDatabase* iconDatabase() const { return m_iconDatabase.get(); }
@@ -440,7 +443,7 @@
WebContextClient m_client;
WebContextConnectionClient m_connectionClient;
WebDownloadClient m_downloadClient;
- WebHistoryClient m_historyClient;
+ std::unique_ptr<API::HistoryClient> m_historyClient;
#if ENABLE(NETSCAPE_PLUGIN_API)
PluginInfoStore m_pluginInfoStore;
Deleted: trunk/Source/WebKit2/UIProcess/WebHistoryClient.cpp (164229 => 164230)
--- 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)
@@ -1,78 +0,0 @@
-/*
- * 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
Deleted: trunk/Source/WebKit2/UIProcess/WebHistoryClient.h (164229 => 164230)
--- 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)
@@ -1,59 +0,0 @@
-/*
- * 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
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (164229 => 164230)
--- 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)
@@ -50,7 +50,6 @@
#include "WebFindClient.h"
#include "WebFormClient.h"
#include "WebFrameProxy.h"
-#include "WebHistoryClient.h"
#include "WebHitTestResult.h"
#include "WebPageContextMenuClient.h"
#include "WebPageCreationParameters.h"
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (164229 => 164230)
--- 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)
@@ -27,6 +27,7 @@
#include "WebProcessProxy.h"
#include "APIFrameHandle.h"
+#include "APIHistoryClient.h"
#include "CustomProtocolManagerProxyMessages.h"
#include "DataReference.h"
#include "DownloadProxyMap.h"
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (164229 => 164230)
--- 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)
@@ -199,6 +199,7 @@
1A64230912DD09EB00CAAE2C /* DrawingAreaProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A64230712DD09EB00CAAE2C /* DrawingAreaProxyMessages.h */; };
1A64245E12DE29A100CAAE2C /* UpdateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A64245C12DE29A100CAAE2C /* UpdateInfo.h */; };
1A64245F12DE29A100CAAE2C /* UpdateInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A64245D12DE29A100CAAE2C /* UpdateInfo.cpp */; };
+ 1A6637D718B2831F00C0BCF3 /* APIHistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6637D618B2831F00C0BCF3 /* APIHistoryClient.h */; };
1A66BF8F18A052ED002071B4 /* WKWebViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */; };
1A6F9F9011E13EFC00DB1371 /* CommandLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */; };
1A6F9FB711E1408500DB1371 /* CommandLinePOSIX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6F9FB611E1408500DB1371 /* CommandLinePOSIX.cpp */; };
@@ -1323,8 +1324,6 @@
BCF4DE23168E4BD500C94AFC /* NetworkProcessSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF4DE22168E4BD500C94AFC /* NetworkProcessSupplement.h */; };
BCF4DE25168FA44800C94AFC /* WebContextSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF4DE24168FA44800C94AFC /* WebContextSupplement.h */; };
BCF50728124329AA005955AE /* WebCertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF50726124329AA005955AE /* WebCertificateInfo.h */; };
- BCF69F861176CD6F00471A52 /* WebHistoryClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF69F841176CD6F00471A52 /* WebHistoryClient.cpp */; };
- BCF69F871176CD6F00471A52 /* WebHistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69F851176CD6F00471A52 /* WebHistoryClient.h */; };
BCF69F9A1176CED600471A52 /* WebNavigationDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69F981176CED600471A52 /* WebNavigationDataStore.h */; };
BCF69FA21176D01400471A52 /* APINavigationData.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69FA01176D01400471A52 /* APINavigationData.h */; };
BCF69FA31176D01400471A52 /* APINavigationData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF69FA11176D01400471A52 /* APINavigationData.cpp */; };
@@ -1870,6 +1869,7 @@
1A64230712DD09EB00CAAE2C /* DrawingAreaProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaProxyMessages.h; sourceTree = "<group>"; };
1A64245C12DE29A100CAAE2C /* UpdateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UpdateInfo.h; sourceTree = "<group>"; };
1A64245D12DE29A100CAAE2C /* UpdateInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UpdateInfo.cpp; sourceTree = "<group>"; };
+ 1A6637D618B2831F00C0BCF3 /* APIHistoryClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIHistoryClient.h; sourceTree = "<group>"; };
1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewInternal.h; sourceTree = "<group>"; };
1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandLine.h; sourceTree = "<group>"; };
1A6F9FB611E1408500DB1371 /* CommandLinePOSIX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLinePOSIX.cpp; sourceTree = "<group>"; };
@@ -3105,8 +3105,6 @@
BCF4DE24168FA44800C94AFC /* WebContextSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextSupplement.h; sourceTree = "<group>"; };
BCF5068412431861005955AE /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
BCF50726124329AA005955AE /* WebCertificateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCertificateInfo.h; sourceTree = "<group>"; };
- 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>"; };
BCF69F981176CED600471A52 /* WebNavigationDataStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNavigationDataStore.h; sourceTree = "<group>"; };
BCF69FA01176D01400471A52 /* APINavigationData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APINavigationData.h; sourceTree = "<group>"; };
BCF69FA11176D01400471A52 /* APINavigationData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APINavigationData.cpp; sourceTree = "<group>"; };
@@ -5125,8 +5123,6 @@
BC0E615212D6CAC80012A72A /* WebGeolocationManagerProxy.messages.in */,
BC1BE1F112D54DBD0004A228 /* WebGeolocationProvider.cpp */,
BC1BE1F012D54DBD0004A228 /* WebGeolocationProvider.h */,
- BCF69F841176CD6F00471A52 /* WebHistoryClient.cpp */,
- BCF69F851176CD6F00471A52 /* WebHistoryClient.h */,
511B24A8132E097200065A0C /* WebIconDatabase.cpp */,
511B24A9132E097200065A0C /* WebIconDatabase.h */,
5184BC4A132E907A006B9E28 /* WebIconDatabase.messages.in */,
@@ -5172,11 +5168,12 @@
BC032DC410F4387C0058C15A /* API */ = {
isa = PBXGroup;
children = (
- 2DA944771884E3AB00ED86DB /* ios */,
BC0C376610F807660076D7CB /* C */,
37C4C08318149C2A003688B9 /* Cocoa */,
BC8A501311765F4500757573 /* cpp */,
+ 2DA944771884E3AB00ED86DB /* ios */,
BC111B47112F616900337BAB /* mac */,
+ 1A6637D618B2831F00C0BCF3 /* APIHistoryClient.h */,
1A2464F21891E45100234C5B /* APILoaderClient.h */,
1AFDD3141891B54000153970 /* APIPolicyClient.h */,
1A4D664718A2D91A00D82E21 /* APIUIClient.h */,
@@ -6363,6 +6360,7 @@
1ADCB86B189831B30022EE5A /* NavigationActionData.h in Headers */,
935EEBA2127761D0003322B8 /* InjectedBundleBackForwardList.h in Headers */,
935EEBA4127761D6003322B8 /* InjectedBundleBackForwardListItem.h in Headers */,
+ 1A6637D718B2831F00C0BCF3 /* APIHistoryClient.h in Headers */,
BCEE7DC5128B645D009827DA /* InjectedBundleClient.h in Headers */,
BC498618124D10E200D834E1 /* InjectedBundleHitTestResult.h in Headers */,
84477853176FCC0800CDC7BB /* InjectedBundleHitTestResultMediaType.h in Headers */,
@@ -6639,7 +6637,6 @@
BC0E607312D6BC200012A72A /* WebGeolocationPosition.h in Headers */,
BC1BE1F212D54DBD0004A228 /* WebGeolocationProvider.h in Headers */,
0F174AA3142A4CB70039250F /* APIGeometry.h in Headers */,
- BCF69F871176CD6F00471A52 /* WebHistoryClient.h in Headers */,
1A4D664818A2D91A00D82E21 /* APIUIClient.h in Headers */,
7801C09A142290C400FAF9AF /* WebHitTestResult.h in Headers */,
511B24AB132E097200065A0C /* WebIconDatabase.h in Headers */,
@@ -8049,7 +8046,6 @@
BC0E618212D6CB1D0012A72A /* WebGeolocationManagerProxyMessageReceiver.cpp in Sources */,
BC0E607412D6BC200012A72A /* WebGeolocationPosition.cpp in Sources */,
BC1BE1F312D54DBD0004A228 /* WebGeolocationProvider.cpp in Sources */,
- BCF69F861176CD6F00471A52 /* WebHistoryClient.cpp in Sources */,
7801C099142290C400FAF9AF /* WebHitTestResult.cpp in Sources */,
511B24AA132E097200065A0C /* WebIconDatabase.cpp in Sources */,
51834592134532E90092B696 /* WebIconDatabaseClient.cpp in Sources */,
