Title: [176847] trunk/Source/WebKit2
Revision
176847
Author
[email protected]
Date
2014-12-05 10:20:23 -0800 (Fri, 05 Dec 2014)

Log Message

Add an API::WebsiteDataStore object and use it for _WKWebsiteDataStore
https://bugs.webkit.org/show_bug.cgi?id=139304

Reviewed by Tim Horton.

* Shared/APIObject.h:
* Shared/Cocoa/APIObject.mm:
(API::Object::newObject):
Make _WKWebsiteDataStore a wrapper for API::WebsiteDataStore instead of API::Session.

* UIProcess/API/APIWebsiteDataStore.cpp: Added.
(API::generateNonPersistentSessionID):
(API::WebsiteDataStore::defaultDataStore):
(API::WebsiteDataStore::createNonPersistentDataStore):
(API::WebsiteDataStore::WebsiteDataStore):
(API::WebsiteDataStore::~WebsiteDataStore):
(API::WebsiteDataStore::isNonPersistent):
Add new WebsiteDataStore implementation. Currently it only contains the WebCore Session ID, but more will be
added to it in upcoming commits.

* UIProcess/API/APIWebsiteDataStore.h:
Add header.

* UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm: Added.
(API::WebsiteDataStore::defaultDataStoreConfiguration):
Platform specific file that returns the default data store configuration.

* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
Set the session ID from the website data store.

* UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:
(+[_WKWebsiteDataStore defaultDataStore]):
(+[_WKWebsiteDataStore nonPersistentDataStore]):
(-[_WKWebsiteDataStore dealloc]):
(-[_WKWebsiteDataStore isNonPersistent]):
(-[_WKWebsiteDataStore _apiObject]):
Update now that we wrap an API::WebsiteDataStore instead.

* UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h:
(WebKit::wrapper):
Update for API::Session -> API::WebsiteDataStore change.

* WebKit2.xcodeproj/project.pbxproj:
Add new files.

Modified Paths

Added Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (176846 => 176847)


--- trunk/Source/WebKit2/ChangeLog	2014-12-05 17:55:33 UTC (rev 176846)
+++ trunk/Source/WebKit2/ChangeLog	2014-12-05 18:20:23 UTC (rev 176847)
@@ -1,3 +1,51 @@
+2014-12-05  Anders Carlsson  <[email protected]>
+
+        Add an API::WebsiteDataStore object and use it for _WKWebsiteDataStore
+        https://bugs.webkit.org/show_bug.cgi?id=139304
+
+        Reviewed by Tim Horton.
+
+        * Shared/APIObject.h:
+        * Shared/Cocoa/APIObject.mm:
+        (API::Object::newObject):
+        Make _WKWebsiteDataStore a wrapper for API::WebsiteDataStore instead of API::Session.
+
+        * UIProcess/API/APIWebsiteDataStore.cpp: Added.
+        (API::generateNonPersistentSessionID):
+        (API::WebsiteDataStore::defaultDataStore):
+        (API::WebsiteDataStore::createNonPersistentDataStore):
+        (API::WebsiteDataStore::WebsiteDataStore):
+        (API::WebsiteDataStore::~WebsiteDataStore):
+        (API::WebsiteDataStore::isNonPersistent):
+        Add new WebsiteDataStore implementation. Currently it only contains the WebCore Session ID, but more will be
+        added to it in upcoming commits.
+
+        * UIProcess/API/APIWebsiteDataStore.h:
+        Add header.
+
+        * UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm: Added.
+        (API::WebsiteDataStore::defaultDataStoreConfiguration):
+        Platform specific file that returns the default data store configuration.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView initWithFrame:configuration:]):
+        Set the session ID from the website data store.
+
+        * UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:
+        (+[_WKWebsiteDataStore defaultDataStore]):
+        (+[_WKWebsiteDataStore nonPersistentDataStore]):
+        (-[_WKWebsiteDataStore dealloc]):
+        (-[_WKWebsiteDataStore isNonPersistent]):
+        (-[_WKWebsiteDataStore _apiObject]):
+        Update now that we wrap an API::WebsiteDataStore instead.
+
+        * UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h:
+        (WebKit::wrapper):
+        Update for API::Session -> API::WebsiteDataStore change.
+
+        * WebKit2.xcodeproj/project.pbxproj:
+        Add new files.
+
 2014-12-05  David Kilzer  <[email protected]>
 
         FeatureDefines.xcconfig: Workaround bug in Xcode 5.1.1 when defining ENABLE_WEB_REPLAY

Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (176846 => 176847)


--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h	2014-12-05 17:55:33 UTC (rev 176846)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h	2014-12-05 18:20:23 UTC (rev 176847)
@@ -30,7 +30,7 @@
 #if TARGET_OS_IPHONE
 #define WK_API_ENABLED 1
 #else
-#define WK_API_ENABLED (defined(__clang__) && defined(__APPLE__) && !defined(__i386__))
+#define WK_API_ENABLED 0// (defined(__clang__) && defined(__APPLE__) && !defined(__i386__))
 #endif
 #endif
 

Modified: trunk/Source/WebKit2/Shared/APIObject.h (176846 => 176847)


--- trunk/Source/WebKit2/Shared/APIObject.h	2014-12-05 17:55:33 UTC (rev 176846)
+++ trunk/Source/WebKit2/Shared/APIObject.h	2014-12-05 18:20:23 UTC (rev 176847)
@@ -135,6 +135,7 @@
         UserMediaPermissionRequest,
         Vibration,
         ViewportAttributes,
+        WebsiteDataStore,
 
         // Bundle types
         Bundle,

Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (176846 => 176847)


--- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm	2014-12-05 17:55:33 UTC (rev 176846)
+++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm	2014-12-05 18:20:23 UTC (rev 176847)
@@ -136,10 +136,6 @@
         wrapper = [WKBrowsingContextGroup alloc];
         break;
 
-    case Type::Session:
-        wrapper = [_WKWebsiteDataStore alloc];
-        break;
-            
     case Type::String:
         wrapper = NSAllocateObject([WKNSString class], size, nullptr);
         break;
@@ -152,6 +148,10 @@
         wrapper = NSAllocateObject([WKNSURLRequest class], size, nullptr);
         break;
 
+    case Type::WebsiteDataStore:
+        wrapper = [_WKWebsiteDataStore alloc];
+        break;
+
     case Type::BundleFrame:
         wrapper = [WKWebProcessPlugInFrame alloc];
         break;

Copied: trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp (from rev 176846, trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm) (0 => 176847)


--- trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp	                        (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp	2014-12-05 18:20:23 UTC (rev 176847)
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+#include "config.h"
+#include "APIWebsiteDataStore.h"
+
+#include <WebCore/SessionID.h>
+
+namespace API {
+
+static uint64_t generateNonPersistentSessionID()
+{
+    // FIXME: We count backwards here to not conflict with API::Session.
+    static uint64_t sessionID = std::numeric_limits<uint64_t>::max();
+
+    return --sessionID;
+}
+
+RefPtr<WebsiteDataStore> WebsiteDataStore::defaultDataStore()
+{
+    static WebsiteDataStore* defaultDataStore = adoptRef(new WebsiteDataStore(defaultDataStoreConfiguration())).leakRef();
+
+    return defaultDataStore;
+}
+
+RefPtr<WebsiteDataStore> WebsiteDataStore::createNonPersistentDataStore()
+{
+    return adoptRef(new WebsiteDataStore);
+}
+
+WebsiteDataStore::WebsiteDataStore()
+    : m_sessionID(WebCore::SessionID(generateNonPersistentSessionID()))
+{
+}
+
+WebsiteDataStore::WebsiteDataStore(Configuration configuration)
+    : m_sessionID(WebCore::SessionID::defaultSessionID())
+{
+}
+
+WebsiteDataStore::~WebsiteDataStore()
+{
+}
+
+bool WebsiteDataStore::isNonPersistent()
+{
+    return m_sessionID.isEphemeral();
+}
+
+}

Copied: trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h (from rev 176846, trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm) (0 => 176847)


--- trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h	                        (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h	2014-12-05 18:20:23 UTC (rev 176847)
@@ -0,0 +1,60 @@
+/*
+ * 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 APIWebsiteDataStore_h
+#define APIWebsiteDataStore_h
+
+#include "APIObject.h"
+#include <WebCore/SessionID.h>
+#include <wtf/text/WTFString.h>
+
+namespace API {
+
+class WebsiteDataStore final : public ObjectImpl<Object::Type::WebsiteDataStore> {
+public:
+    struct Configuration {
+        // FIXME: Add configuration parameters here.
+    };
+
+    static RefPtr<WebsiteDataStore> defaultDataStore();
+    static RefPtr<WebsiteDataStore> createNonPersistentDataStore();
+    virtual ~WebsiteDataStore();
+
+    bool isNonPersistent();
+
+    WebCore::SessionID sessionID() const { return m_sessionID; }
+
+private:
+    static Configuration defaultDataStoreConfiguration();
+
+    WebsiteDataStore();
+    WebsiteDataStore(Configuration);
+
+    WebCore::SessionID m_sessionID;
+};
+
+}
+
+#endif // APIWebsiteDataStore_h

Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm (from rev 176846, trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h) (0 => 176847)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm	                        (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm	2014-12-05 18:20:23 UTC (rev 176847)
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+#include "config.h"
+#include "APIWebsiteDataStore.h"
+
+namespace API {
+
+WebsiteDataStore::Configuration WebsiteDataStore::defaultDataStoreConfiguration()
+{
+    // FIXME: Fill everything in.
+    Configuration configuration;
+
+    return configuration;
+}
+
+}

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (176846 => 176847)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2014-12-05 17:55:33 UTC (rev 176846)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2014-12-05 18:20:23 UTC (rev 176847)
@@ -271,8 +271,8 @@
 
     webPageConfiguration.userContentController = [_configuration userContentController]->_userContentControllerProxy.get();
     webPageConfiguration.visitedLinkProvider = [_configuration _visitedLinkProvider]->_visitedLinkProvider.get();
-    webPageConfiguration.sessionID = [_configuration _websiteDataStore]->_session->getID();
-    
+    webPageConfiguration.sessionID = [_configuration _websiteDataStore]->_websiteDataStore->sessionID();
+
     RefPtr<WebKit::WebPageGroup> pageGroup;
     NSString *groupIdentifier = configuration._groupIdentifier;
     if (groupIdentifier.length) {

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm (176846 => 176847)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm	2014-12-05 17:55:33 UTC (rev 176846)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm	2014-12-05 18:20:23 UTC (rev 176847)
@@ -28,38 +28,35 @@
 
 #if WK_API_ENABLED
 
-using namespace WebKit;
-
 @implementation _WKWebsiteDataStore
 
 + (instancetype)defaultDataStore
 {
-    return wrapper(API::Session::defaultSession());
+    return WebKit::wrapper(*API::WebsiteDataStore::defaultDataStore().get());
 }
 
 + (instancetype)nonPersistentDataStore
 {
-    RefPtr<API::Session> session = API::Session::createEphemeral();
-    return [wrapper(*session.release().leakRef()) autorelease];
+    return [WebKit::wrapper(*API::WebsiteDataStore::createNonPersistentDataStore().release().leakRef()) autorelease];
 }
 
 - (void)dealloc
 {
-    _session->API::Session::~Session();
+    _websiteDataStore->API::WebsiteDataStore::~WebsiteDataStore();
 
     [super dealloc];
 }
 
 - (BOOL)isNonPersistent
 {
-    return _session->isEphemeral();
+    return _websiteDataStore->isNonPersistent();
 }
 
 #pragma mark WKObject protocol implementation
 
 - (API::Object&)_apiObject
 {
-    return *_session;
+    return *_websiteDataStore;
 }
 
 @end

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h (176846 => 176847)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h	2014-12-05 17:55:33 UTC (rev 176846)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h	2014-12-05 18:20:23 UTC (rev 176847)
@@ -27,22 +27,22 @@
 
 #if WK_API_ENABLED
 
+#import "APIWebsiteDataStore.h"
 #import "WKObject.h"
-#import "APISession.h"
 
 namespace WebKit {
 
-inline _WKWebsiteDataStore *wrapper(API::Session& session)
+inline _WKWebsiteDataStore *wrapper(API::WebsiteDataStore& websiteDataStore)
 {
-    ASSERT([session.wrapper() isKindOfClass:[_WKWebsiteDataStore class]]);
-    return (_WKWebsiteDataStore *)session.wrapper();
+    ASSERT([websiteDataStore.wrapper() isKindOfClass:[_WKWebsiteDataStore class]]);
+    return (_WKWebsiteDataStore *)websiteDataStore.wrapper();
 }
 
 }
 
 @interface _WKWebsiteDataStore () <WKObject> {
 @package
-    API::ObjectStorage<API::Session> _session;
+    API::ObjectStorage<API::WebsiteDataStore> _websiteDataStore;
 }
 @end
 

Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (176846 => 176847)


--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2014-12-05 17:55:33 UTC (rev 176846)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2014-12-05 18:20:23 UTC (rev 176847)
@@ -212,6 +212,9 @@
 		1A30EAC6115D7DA30053E937 /* ConnectionMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A30EAC5115D7DA30053E937 /* ConnectionMac.mm */; };
 		1A334DED16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */; };
 		1A334DEE16DE8F88006A8E38 /* StorageAreaMapMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */; };
+		1A3635A91A3144A300ED6197 /* APIWebsiteDataStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3635A71A3144A300ED6197 /* APIWebsiteDataStore.cpp */; };
+		1A3635AA1A3144A300ED6197 /* APIWebsiteDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3635A81A3144A300ED6197 /* APIWebsiteDataStore.h */; };
+		1A3635AD1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A3635AB1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm */; };
 		1A3C888018A5ABAE00C4C962 /* WKPreferencesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */; };
 		1A3CC16618906ACF001E6ED8 /* WKWebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A3CC16418906ACF001E6ED8 /* WKWebView.mm */; };
 		1A3CC16718906ACF001E6ED8 /* WKWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3CC16518906ACF001E6ED8 /* WKWebView.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -2183,6 +2186,9 @@
 		1A334DEA16DE8B68006A8E38 /* StorageAreaMap.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageAreaMap.messages.in; sourceTree = "<group>"; };
 		1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaMapMessageReceiver.cpp; sourceTree = "<group>"; };
 		1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageAreaMapMessages.h; sourceTree = "<group>"; };
+		1A3635A71A3144A300ED6197 /* APIWebsiteDataStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIWebsiteDataStore.cpp; sourceTree = "<group>"; };
+		1A3635A81A3144A300ED6197 /* APIWebsiteDataStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIWebsiteDataStore.h; sourceTree = "<group>"; };
+		1A3635AB1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = APIWebsiteDataStoreCocoa.mm; sourceTree = "<group>"; };
 		1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesInternal.h; sourceTree = "<group>"; };
 		1A3CC16418906ACF001E6ED8 /* WKWebView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebView.mm; sourceTree = "<group>"; };
 		1A3CC16518906ACF001E6ED8 /* WKWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebView.h; sourceTree = "<group>"; };
@@ -5061,6 +5067,7 @@
 				75A8D2C4187CCF9F00C39C9E /* _WKWebsiteDataStore.h */,
 				75A8D2C5187CCF9F00C39C9E /* _WKWebsiteDataStore.mm */,
 				75A8D2D4187D1C0100C39C9E /* _WKWebsiteDataStoreInternal.h */,
+				1A3635AB1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm */,
 				1AFDE64319510B5500C48FFA /* LegacyBundleForClass.mm */,
 				37C4C08B1814AC5C003688B9 /* WKBackForwardList.h */,
 				37C4C08A1814AC5C003688B9 /* WKBackForwardList.mm */,
@@ -5969,6 +5976,8 @@
 				1AFDE65F1954E9B100C48FFA /* APISessionState.cpp */,
 				1AFDE6601954E9B100C48FFA /* APISessionState.h */,
 				1A4D664718A2D91A00D82E21 /* APIUIClient.h */,
+				1A3635A71A3144A300ED6197 /* APIWebsiteDataStore.cpp */,
+				1A3635A81A3144A300ED6197 /* APIWebsiteDataStore.h */,
 			);
 			path = API;
 			sourceTree = "<group>";
@@ -7233,6 +7242,7 @@
 				1A90C1F41264FD71003E44D4 /* FindController.h in Headers */,
 				515E7728183DD6F60007203F /* AsyncRequest.h in Headers */,
 				BCE81D8D1319F7EF00241910 /* FontInfo.h in Headers */,
+				1A3635AA1A3144A300ED6197 /* APIWebsiteDataStore.h in Headers */,
 				1ABC3DFC1899F51C004F0626 /* WKNavigationDelegate.h in Headers */,
 				1AE52F9219201DA700A1FA37 /* APIContextConfiguration.h in Headers */,
 				7C361D731927FA360036A59D /* WebScriptMessageHandler.h in Headers */,
@@ -9030,6 +9040,7 @@
 				2D2ADF0916362DD500197E47 /* PDFPluginTextAnnotation.mm in Sources */,
 				BCC43ABA127B95DC00317F16 /* PlatformPopupMenuData.cpp in Sources */,
 				1A6FB7D211E651E200DB1371 /* Plugin.cpp in Sources */,
+				1A3635AD1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm in Sources */,
 				CEDBA84719FDA00A006866A5 /* WebSQLiteDatabaseTracker.cpp in Sources */,
 				31A67E0C165B2A99006CBA66 /* PlugInAutoStartProvider.cpp in Sources */,
 				1A8EF4CC1252403700F7067F /* PluginControllerProxy.cpp in Sources */,
@@ -9170,6 +9181,7 @@
 				2D125C5F1857EA05003BA3CB /* ViewGestureControllerMac.mm in Sources */,
 				BC82839916B48DC000A278FE /* WebContentServiceEntryPoint.mm in Sources */,
 				2684054F18B86C8E0022C38B /* ViewUpdateDispatcher.cpp in Sources */,
+				1A3635A91A3144A300ED6197 /* APIWebsiteDataStore.cpp in Sources */,
 				BCB9E2441120DACA00A137E0 /* WebContext.cpp in Sources */,
 				31A505F91680025500A930EB /* WebContextClient.cpp in Sources */,
 				BC09B8F8147460F7005F5625 /* WebContextConnectionClient.cpp in Sources */,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to