Diff
Modified: trunk/Source/WebKit2/ChangeLog (159460 => 159461)
--- trunk/Source/WebKit2/ChangeLog 2013-11-18 23:08:30 UTC (rev 159460)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-18 23:16:16 UTC (rev 159461)
@@ -1,3 +1,35 @@
+2013-11-18 Anders Carlsson <[email protected]>
+
+ Rename WebNavigationData to API::NavigationData
+ https://bugs.webkit.org/show_bug.cgi?id=124542
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/C/WKAPICast.h:
+ * UIProcess/API/C/WKNavigationDataRef.cpp:
+ (WKNavigationDataGetTypeID):
+ * UIProcess/API/Cocoa/WKNavigationData.mm:
+ (-[WKNavigationData dealloc]):
+ (-[WKNavigationData title]):
+ (-[WKNavigationData originalRequest]):
+ (-[WKNavigationData destinationURL]):
+ (-[WKNavigationData response]):
+ * UIProcess/API/Cocoa/WKNavigationDataInternal.h:
+ (WebKit::wrapper):
+ * UIProcess/API/mac/WKProcessGroup.mm:
+ * UIProcess/APINavigationData.cpp: Renamed from Source/WebKit2/UIProcess/WebNavigationData.cpp.
+ (API::NavigationData::NavigationData):
+ (API::NavigationData::~NavigationData):
+ * UIProcess/APINavigationData.h: Renamed from Source/WebKit2/UIProcess/WebNavigationData.h.
+ (API::NavigationData::create):
+ (API::NavigationData::title):
+ (API::NavigationData::url):
+ (API::NavigationData::originalRequest):
+ (API::NavigationData::response):
+ * UIProcess/WebHistoryClient.cpp:
+ (WebKit::WebHistoryClient::didNavigateWithNavigationData):
+ * WebKit2.xcodeproj/project.pbxproj:
+
2013-11-18 David Hyatt <[email protected]>
Add a quirk to not respect center text-align when positioning
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (159460 => 159461)
--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2013-11-18 23:08:30 UTC (rev 159460)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2013-11-18 23:16:16 UTC (rev 159461)
@@ -50,6 +50,10 @@
#include <WebCore/ProtectionSpace.h>
#include <WebCore/Settings.h>
+namespace API {
+class NavigationData;
+}
+
namespace WebKit {
class AuthenticationChallengeProxy;
@@ -79,7 +83,6 @@
class WebInspectorProxy;
class WebKeyValueStorageManager;
class WebMediaCacheManagerProxy;
-class WebNavigationData;
class WebNetworkInfoManagerProxy;
class WebNetworkInfo;
class WebNotification;
@@ -125,7 +128,7 @@
WK_ADD_API_MAPPING(WKIconDatabaseRef, WebIconDatabase)
WK_ADD_API_MAPPING(WKKeyValueStorageManagerRef, WebKeyValueStorageManager)
WK_ADD_API_MAPPING(WKMediaCacheManagerRef, WebMediaCacheManagerProxy)
-WK_ADD_API_MAPPING(WKNavigationDataRef, WebNavigationData)
+WK_ADD_API_MAPPING(WKNavigationDataRef, API::NavigationData)
WK_ADD_API_MAPPING(WKNetworkInfoManagerRef, WebNetworkInfoManagerProxy)
WK_ADD_API_MAPPING(WKNetworkInfoRef, WebNetworkInfo)
WK_ADD_API_MAPPING(WKNotificationManagerRef, WebNotificationManagerProxy)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKNavigationDataRef.cpp (159460 => 159461)
--- trunk/Source/WebKit2/UIProcess/API/C/WKNavigationDataRef.cpp 2013-11-18 23:08:30 UTC (rev 159460)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKNavigationDataRef.cpp 2013-11-18 23:16:16 UTC (rev 159461)
@@ -26,15 +26,15 @@
#include "config.h"
#include "WKNavigationDataRef.h"
+#include "APINavigationData.h"
#include "WKAPICast.h"
-#include "WebNavigationData.h"
#include "WebURLRequest.h"
using namespace WebKit;
WKTypeID WKNavigationDataGetTypeID()
{
- return toAPI(WebNavigationData::APIType);
+ return toAPI(API::NavigationData::APIType);
}
WKStringRef WKNavigationDataCopyTitle(WKNavigationDataRef navigationDataRef)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.mm (159460 => 159461)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.mm 2013-11-18 23:08:30 UTC (rev 159460)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.mm 2013-11-18 23:16:16 UTC (rev 159461)
@@ -35,34 +35,34 @@
using namespace WebKit;
@implementation WKNavigationData {
- std::aligned_storage<sizeof(WebNavigationData), std::alignment_of<WebNavigationData>::value>::type _data;
+ std::aligned_storage<sizeof(API::NavigationData), std::alignment_of<API::NavigationData>::value>::type _data;
}
- (void)dealloc
{
- reinterpret_cast<WebNavigationData*>(&_data)->~WebNavigationData();
+ reinterpret_cast<API::NavigationData*>(&_data)->~NavigationData();
[super dealloc];
}
- (NSString *)title
{
- return reinterpret_cast<WebNavigationData*>(&_data)->title();
+ return reinterpret_cast<API::NavigationData*>(&_data)->title();
}
- (NSURLRequest *)originalRequest
{
- return reinterpret_cast<WebNavigationData*>(&_data)->originalRequest().nsURLRequest(WebCore::DoNotUpdateHTTPBody);
+ return reinterpret_cast<API::NavigationData*>(&_data)->originalRequest().nsURLRequest(WebCore::DoNotUpdateHTTPBody);
}
- (NSURL *)destinationURL
{
- return [NSURL _web_URLWithWTFString:reinterpret_cast<WebNavigationData*>(&_data)->url() relativeToURL:nil];
+ return [NSURL _web_URLWithWTFString:reinterpret_cast<API::NavigationData*>(&_data)->url() relativeToURL:nil];
}
- (NSURLResponse *)response
{
- return reinterpret_cast<WebNavigationData*>(&_data)->response().nsURLResponse();
+ return reinterpret_cast<API::NavigationData*>(&_data)->response().nsURLResponse();
}
#pragma mark WKObject protocol implementation
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDataInternal.h (159460 => 159461)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDataInternal.h 2013-11-18 23:08:30 UTC (rev 159460)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDataInternal.h 2013-11-18 23:16:16 UTC (rev 159461)
@@ -27,13 +27,20 @@
#if WK_API_ENABLED
+#import "APINavigationData.h"
#import "WKObject.h"
-#import "WebNavigationData.h"
namespace WebKit {
-inline WKNavigationData *wrapper(WebNavigationData& data) { ASSERT([data.wrapper() isKindOfClass:[WKNavigationData class]]); return (WKNavigationData *)data.wrapper(); }
+
+inline WKNavigationData *wrapper(API::NavigationData& data)
+{
+ ASSERT([data.wrapper() isKindOfClass:[WKNavigationData class]]);
+
+ return (WKNavigationData *)data.wrapper();
}
+}
+
@interface WKNavigationData () <WKObject>
@end
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.mm (159460 => 159461)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.mm 2013-11-18 23:08:30 UTC (rev 159460)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.mm 2013-11-18 23:16:16 UTC (rev 159461)
@@ -27,6 +27,7 @@
#import "WKProcessGroup.h"
#import "WKProcessGroupPrivate.h"
+#import "APINavigationData.h"
#import "ObjCObjectGraph.h"
#import "WKAPICast.h"
#import "WKBrowsingContextControllerInternal.h"
@@ -39,7 +40,6 @@
#import "WKRetainPtr.h"
#import "WKStringCF.h"
#import "WebFrameProxy.h"
-#import "WebNavigationData.h"
#import <wtf/RetainPtr.h>
using namespace WebKit;
Copied: trunk/Source/WebKit2/UIProcess/APINavigationData.cpp (from rev 159460, trunk/Source/WebKit2/UIProcess/WebNavigationData.cpp) (0 => 159461)
--- trunk/Source/WebKit2/UIProcess/APINavigationData.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/APINavigationData.cpp 2013-11-18 23:16:16 UTC (rev 159461)
@@ -0,0 +1,40 @@
+/*
+ * 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 "APINavigationData.h"
+
+namespace API {
+
+NavigationData::NavigationData(const WebKit::WebNavigationDataStore& store)
+ : m_store(store)
+{
+}
+
+NavigationData::~NavigationData()
+{
+}
+
+} // namespace WebKit
Copied: trunk/Source/WebKit2/UIProcess/APINavigationData.h (from rev 159460, trunk/Source/WebKit2/UIProcess/WebNavigationData.h) (0 => 159461)
--- trunk/Source/WebKit2/UIProcess/APINavigationData.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/APINavigationData.h 2013-11-18 23:16:16 UTC (rev 159461)
@@ -0,0 +1,57 @@
+/*
+ * 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 APINavigationData_h
+#define APINavigationData_h
+
+#include "APIObject.h"
+#include "WebNavigationDataStore.h"
+#include <wtf/PassRefPtr.h>
+
+namespace API {
+
+class NavigationData : public TypedObject<Object::Type::NavigationData> {
+public:
+ static PassRefPtr<NavigationData> create(const WebKit::WebNavigationDataStore& store)
+ {
+ return adoptRef(new NavigationData(store));
+ }
+
+ virtual ~NavigationData();
+
+ String title() const { return m_store.title; }
+ String url() const { return m_store.url; }
+ const WebCore::ResourceRequest& originalRequest() const { return m_store.originalRequest; }
+ const WebCore::ResourceResponse& response() const { return m_store.response; }
+
+private:
+ explicit NavigationData(const WebKit::WebNavigationDataStore&);
+
+ WebKit::WebNavigationDataStore m_store;
+};
+
+} // namespace API
+
+#endif // APINavigationData_h
Modified: trunk/Source/WebKit2/UIProcess/WebHistoryClient.cpp (159460 => 159461)
--- trunk/Source/WebKit2/UIProcess/WebHistoryClient.cpp 2013-11-18 23:08:30 UTC (rev 159460)
+++ trunk/Source/WebKit2/UIProcess/WebHistoryClient.cpp 2013-11-18 23:16:16 UTC (rev 159461)
@@ -26,8 +26,8 @@
#include "config.h"
#include "WebHistoryClient.h"
+#include "APINavigationData.h"
#include "WKAPICast.h"
-#include "WebNavigationData.h"
#include <wtf/RefPtr.h>
using namespace WebCore;
@@ -39,7 +39,7 @@
if (!m_client.didNavigateWithNavigationData)
return;
- RefPtr<WebNavigationData> navigationData = WebNavigationData::create(navigationDataStore);
+ RefPtr<API::NavigationData> navigationData = API::NavigationData::create(navigationDataStore);
m_client.didNavigateWithNavigationData(toAPI(context), toAPI(page), toAPI(navigationData.get()), toAPI(frame), m_client.clientInfo);
}
Deleted: trunk/Source/WebKit2/UIProcess/WebNavigationData.cpp (159460 => 159461)
--- trunk/Source/WebKit2/UIProcess/WebNavigationData.cpp 2013-11-18 23:08:30 UTC (rev 159460)
+++ trunk/Source/WebKit2/UIProcess/WebNavigationData.cpp 2013-11-18 23:16:16 UTC (rev 159461)
@@ -1,40 +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 "WebNavigationData.h"
-
-namespace WebKit {
-
-WebNavigationData::WebNavigationData(const WebNavigationDataStore& store)
- : m_store(store)
-{
-}
-
-WebNavigationData::~WebNavigationData()
-{
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/UIProcess/WebNavigationData.h (159460 => 159461)
--- trunk/Source/WebKit2/UIProcess/WebNavigationData.h 2013-11-18 23:08:30 UTC (rev 159460)
+++ trunk/Source/WebKit2/UIProcess/WebNavigationData.h 2013-11-18 23:16:16 UTC (rev 159461)
@@ -1,57 +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 WebNavigationData_h
-#define WebNavigationData_h
-
-#include "APIObject.h"
-#include "WebNavigationDataStore.h"
-#include <wtf/PassRefPtr.h>
-
-namespace WebKit {
-
-class WebNavigationData : public API::TypedObject<API::Object::Type::NavigationData> {
-public:
- static PassRefPtr<WebNavigationData> create(const WebNavigationDataStore& store)
- {
- return adoptRef(new WebNavigationData(store));
- }
-
- virtual ~WebNavigationData();
-
- String title() const { return m_store.title; }
- String url() const { return m_store.url; }
- const WebCore::ResourceRequest& originalRequest() const { return m_store.originalRequest; }
- const WebCore::ResourceResponse& response() const { return m_store.response; }
-
-private:
- explicit WebNavigationData(const WebNavigationDataStore&);
-
- WebNavigationDataStore m_store;
-};
-
-} // namespace WebKit
-
-#endif // WebNavigationData_h
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (159460 => 159461)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-11-18 23:08:30 UTC (rev 159460)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-11-18 23:16:16 UTC (rev 159461)
@@ -1134,8 +1134,8 @@
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 /* WebNavigationData.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69FA01176D01400471A52 /* WebNavigationData.h */; };
- BCF69FA31176D01400471A52 /* WebNavigationData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF69FA11176D01400471A52 /* WebNavigationData.cpp */; };
+ BCF69FA21176D01400471A52 /* APINavigationData.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69FA01176D01400471A52 /* APINavigationData.h */; };
+ BCF69FA31176D01400471A52 /* APINavigationData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF69FA11176D01400471A52 /* APINavigationData.cpp */; };
BCF69FA91176D1CB00471A52 /* WKNavigationDataRef.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69FA71176D1CB00471A52 /* WKNavigationDataRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCF69FAA1176D1CB00471A52 /* WKNavigationDataRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF69FA81176D1CB00471A52 /* WKNavigationDataRef.cpp */; };
BCFD548B132D82680055D816 /* WKErrorCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCFD5489132D82680055D816 /* WKErrorCF.cpp */; };
@@ -2697,8 +2697,8 @@
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 /* WebNavigationData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNavigationData.h; sourceTree = "<group>"; };
- BCF69FA11176D01400471A52 /* WebNavigationData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebNavigationData.cpp; 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>"; };
BCF69FA71176D1CB00471A52 /* WKNavigationDataRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationDataRef.h; sourceTree = "<group>"; };
BCF69FA81176D1CB00471A52 /* WKNavigationDataRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKNavigationDataRef.cpp; sourceTree = "<group>"; };
BCFCA89516DE96CB00074069 /* PluginService.32-64.Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "PluginService.32-64.Info.plist"; path = "PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist"; sourceTree = SOURCE_ROOT; };
@@ -4293,6 +4293,8 @@
31A2EC401489973700810D71 /* Notifications */,
1AEFCC0511D01F34008219D3 /* Plugins */,
1A44B95816B73F8C00B7BBD8 /* Storage */,
+ BCF69FA11176D01400471A52 /* APINavigationData.cpp */,
+ BCF69FA01176D01400471A52 /* APINavigationData.h */,
BC2652121182608100243E12 /* DrawingAreaProxy.cpp */,
BC2652131182608100243E12 /* DrawingAreaProxy.h */,
1A6422FC12DD08FE00CAAE2C /* DrawingAreaProxy.messages.in */,
@@ -4393,8 +4395,6 @@
33D3A3B71339606200709BE4 /* WebMediaCacheManagerProxy.cpp */,
33D3A3B81339606200709BE4 /* WebMediaCacheManagerProxy.h */,
33D3A3B91339606200709BE4 /* WebMediaCacheManagerProxy.messages.in */,
- BCF69FA11176D01400471A52 /* WebNavigationData.cpp */,
- BCF69FA01176D01400471A52 /* WebNavigationData.h */,
BC1DFEA312B31F87005DF730 /* WebOpenPanelResultListenerProxy.cpp */,
BC1DFEA212B31F87005DF730 /* WebOpenPanelResultListenerProxy.h */,
755422BE18062BE40046F6A8 /* WebOriginDataManagerProxy.cpp */,
@@ -5808,7 +5808,7 @@
33D3A3BB1339606200709BE4 /* WebMediaCacheManagerProxy.h in Headers */,
33D3A3CB1339617900709BE4 /* WebMediaCacheManagerProxyMessages.h in Headers */,
909854ED12BC4E18000AD080 /* WebMemorySampler.h in Headers */,
- BCF69FA21176D01400471A52 /* WebNavigationData.h in Headers */,
+ BCF69FA21176D01400471A52 /* APINavigationData.h in Headers */,
BCF69F9A1176CED600471A52 /* WebNavigationDataStore.h in Headers */,
31A2EC49148997C200810D71 /* WebNotification.h in Headers */,
310999C7146C9E3D0029DEB9 /* WebNotificationClient.h in Headers */,
@@ -7138,7 +7138,7 @@
909854EC12BC4E17000AD080 /* WebMemorySampler.cpp in Sources */,
909854EE12BC4E18000AD080 /* WebMemorySampler.mac.mm in Sources */,
C0337DB0127A28D0008FF4F4 /* WebMouseEvent.cpp in Sources */,
- BCF69FA31176D01400471A52 /* WebNavigationData.cpp in Sources */,
+ BCF69FA31176D01400471A52 /* APINavigationData.cpp in Sources */,
31A2EC48148997C200810D71 /* WebNotification.cpp in Sources */,
31099973146C75A20029DEB9 /* WebNotificationClient.cpp in Sources */,
2DDE0AFB18298CC900F97EAA /* RemoteLayerTreePropertyApplier.mm in Sources */,
