Diff
Modified: trunk/Source/WebKit2/ChangeLog (184911 => 184912)
--- trunk/Source/WebKit2/ChangeLog 2015-05-27 18:39:07 UTC (rev 184911)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-27 18:53:49 UTC (rev 184912)
@@ -1,3 +1,57 @@
+2015-05-26 Anders Carlsson <[email protected]>
+
+ WKWebsiteDataStore should handle media keys
+ https://bugs.webkit.org/show_bug.cgi?id=145394
+ rdar://problem/20617794.
+
+ Reviewed by Darin Adler.
+
+ * Shared/WebsiteData/WebsiteDataTypes.h:
+ Add WebsiteDataTypeMediaKeys enum.
+
+ * UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm:
+ (API::WebsiteDataStore::defaultDataStoreConfiguration):
+ Set up mediaKeysStorageDirectory.
+
+ * UIProcess/API/Cocoa/WKWebsiteDataRecord.mm:
+ (dataTypesToString):
+ * UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h:
+ (WebKit::toWebsiteDataTypes):
+ (WebKit::toWKWebsiteDataTypes):
+ * UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h: Added.
+ Add _WKWebsiteDataTypeMediaKeys.
+
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::legacyWebsiteDataStoreConfiguration):
+ Set up mediaKeysStorageDirectory.
+
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::WebsiteDataStore):
+ Set m_mediaKeysStorageDirectory.
+
+ (WebKit::WebsiteDataStore::fetchData):
+ Make CallbackAggregator ThreadSafeRefCounted.
+ Handle WebsiteDataTypeMediaKeys by calling mediaKeyOrigins on our background queue.
+
+ (WebKit::WebsiteDataStore::removeData):
+ Make CallbackAggregator ThreadSafeRefCounted.
+ Handle WebsiteDataTypeMediaKeys by calling removeMediaKeys on our background queue.
+
+ (WebKit::WebsiteDataStore::mediaKeyOrigins):
+ Compute the origins.
+
+ (WebKit::computeMediaKeyFile):
+ Add helper function that returns the media key given a containing directory.
+
+ (WebKit::WebsiteDataStore::removeMediaKeys):
+ Remove media key files.
+
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+ Add new members.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Add new files.
+
2015-05-27 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.9.2 release.
Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h (184911 => 184912)
--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2015-05-27 18:39:07 UTC (rev 184911)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2015-05-27 18:53:49 UTC (rev 184912)
@@ -37,6 +37,7 @@
WebsiteDataTypeLocalStorage = 1 << 5,
WebsiteDataTypeWebSQLDatabases = 1 << 6,
WebsiteDataTypeIndexedDBDatabases = 1 << 7,
+ WebsiteDataTypeMediaKeys = 1 << 8,
};
};
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm (184911 => 184912)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm 2015-05-27 18:39:07 UTC (rev 184911)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm 2015-05-27 18:53:49 UTC (rev 184912)
@@ -117,6 +117,7 @@
configuration.webSQLDatabaseDirectory = websiteDataDirectoryFileSystemRepresentation("WebSQL");
configuration.localStorageDirectory = websiteDataDirectoryFileSystemRepresentation("LocalStorage");
+ configuration.mediaKeysStorageDirectory = websiteDataDirectoryFileSystemRepresentation("MediaKeys");
return configuration;
}
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm (184911 => 184912)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm 2015-05-27 18:39:07 UTC (rev 184911)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm 2015-05-27 18:53:49 UTC (rev 184912)
@@ -39,6 +39,8 @@
NSString * const WKWebsiteDataTypeWebSQLDatabases = @"WKWebsiteDataTypeWebSQLDatabases";
NSString * const WKWebsiteDataTypeIndexedDBDatabases = @"WKWebsiteDataTypeIndexedDBDatabases";
+NSString * const _WKWebsiteDataTypeMediaKeys = @"_WKWebsiteDataTypeMediaKeys";
+
@implementation WKWebsiteDataRecord
- (void)dealloc
@@ -68,6 +70,8 @@
[array addObject:@"Web SQL"];
if ([dataTypes containsObject:WKWebsiteDataTypeIndexedDBDatabases])
[array addObject:@"IndexedDB"];
+ if ([dataTypes containsObject:_WKWebsiteDataTypeMediaKeys])
+ [array addObject:@"Media Keys"];
return [array componentsJoinedByString:@", "];
}
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h (184911 => 184912)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h 2015-05-27 18:39:07 UTC (rev 184911)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h 2015-05-27 18:53:49 UTC (rev 184912)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "WKWebsiteDataRecord.h"
+#import "WKWebsiteDataRecordPrivate.h"
#if WK_API_ENABLED
@@ -60,6 +60,8 @@
websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeWebSQLDatabases;
if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeIndexedDBDatabases])
websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases;
+ if ([wkWebsiteDataTypes containsObject:_WKWebsiteDataTypeMediaKeys])
+ websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeMediaKeys;
return static_cast<WebsiteDataTypes>(websiteDataTypes);
}
@@ -86,6 +88,8 @@
[wkWebsiteDataTypes addObject:WKWebsiteDataTypeWebSQLDatabases];
if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases)
[wkWebsiteDataTypes addObject:WKWebsiteDataTypeIndexedDBDatabases];
+ if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeMediaKeys)
+ [wkWebsiteDataTypes addObject:_WKWebsiteDataTypeMediaKeys];
return wkWebsiteDataTypes;
}
Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h (from rev 184907, trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h) (0 => 184912)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h 2015-05-27 18:53:49 UTC (rev 184912)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/WKWebsiteDataRecord.h>
+
+#if WK_API_ENABLED
+
+WK_EXTERN NSString * const _WKWebsiteDataTypeMediaKeys WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
+#endif
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (184911 => 184912)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-05-27 18:39:07 UTC (rev 184911)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-05-27 18:53:49 UTC (rev 184912)
@@ -137,6 +137,7 @@
configuration.localStorageDirectory = processPoolConfiguration.localStorageDirectory();
configuration.webSQLDatabaseDirectory = processPoolConfiguration.webSQLDatabaseDirectory();
configuration.applicationCacheDirectory = WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory();
+ configuration.mediaKeysStorageDirectory = WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory();
return configuration;
}
Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (184911 => 184912)
--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-05-27 18:39:07 UTC (rev 184911)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-05-27 18:53:49 UTC (rev 184912)
@@ -34,6 +34,7 @@
#include <WebCore/ApplicationCacheStorage.h>
#include <WebCore/DatabaseTracker.h>
#include <WebCore/OriginLock.h>
+#include <WebCore/SecurityOrigin.h>
#include <wtf/RunLoop.h>
namespace WebKit {
@@ -69,6 +70,7 @@
, m_networkCacheDirectory(WTF::move(configuration.networkCacheDirectory))
, m_applicationCacheDirectory(WTF::move(configuration.applicationCacheDirectory))
, m_webSQLDatabaseDirectory(WTF::move(configuration.webSQLDatabaseDirectory))
+ , m_mediaKeysStorageDirectory(WTF::move(configuration.mediaKeysStorageDirectory))
, m_storageManager(StorageManager::create(WTF::move(configuration.localStorageDirectory)))
, m_queue(WorkQueue::create("com.apple.WebKit.WebsiteDataStore"))
{
@@ -140,7 +142,7 @@
void WebsiteDataStore::fetchData(WebsiteDataTypes dataTypes, std::function<void (Vector<WebsiteDataRecord>)> completionHandler)
{
- struct CallbackAggregator final : public RefCounted<CallbackAggregator> {
+ struct CallbackAggregator final : ThreadSafeRefCounted<CallbackAggregator> {
explicit CallbackAggregator(std::function<void (Vector<WebsiteDataRecord>)> completionHandler)
: completionHandler(WTF::move(completionHandler))
{
@@ -343,6 +345,24 @@
}
#endif
+ if (dataTypes & WebsiteDataTypeMediaKeys && isPersistent()) {
+ StringCapture mediaKeysStorageDirectory { m_mediaKeysStorageDirectory };
+
+ callbackAggregator->addPendingCallback();
+
+ m_queue->dispatch([mediaKeysStorageDirectory, callbackAggregator] {
+ auto origins = mediaKeyOrigins(mediaKeysStorageDirectory.string());
+
+ RunLoop::main().dispatch([callbackAggregator, origins]() mutable {
+ WebsiteData websiteData;
+ for (auto& origin : origins)
+ websiteData.entries.append(WebsiteData::Entry { WTF::move(origin), WebsiteDataTypeMediaKeys });
+
+ callbackAggregator->removePendingCallback(WTF::move(websiteData));
+ });
+ });
+ }
+
callbackAggregator->callIfNeeded();
}
@@ -377,7 +397,7 @@
void WebsiteDataStore::removeData(WebsiteDataTypes dataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
{
- struct CallbackAggregator : public RefCounted<CallbackAggregator> {
+ struct CallbackAggregator : ThreadSafeRefCounted<CallbackAggregator> {
explicit CallbackAggregator (std::function<void ()> completionHandler)
: completionHandler(WTF::move(completionHandler))
{
@@ -516,6 +536,20 @@
}
#endif
+ if (dataTypes & WebsiteDataTypeMediaKeys && isPersistent()) {
+ StringCapture mediaKeysStorageDirectory { m_mediaKeysStorageDirectory };
+
+ callbackAggregator->addPendingCallback();
+
+ m_queue->dispatch([mediaKeysStorageDirectory, callbackAggregator, modifiedSince] {
+ removeMediaKeys(mediaKeysStorageDirectory.string(), modifiedSince);
+
+ RunLoop::main().dispatch([callbackAggregator] {
+ callbackAggregator->removePendingCallback();
+ });
+ });
+ }
+
// There's a chance that we don't have any pending callbacks. If so, we want to dispatch the completion handler right away.
callbackAggregator->callIfNeeded();
}
@@ -529,7 +563,7 @@
origins.append(origin);
}
- struct CallbackAggregator : public ThreadSafeRefCounted<CallbackAggregator> {
+ struct CallbackAggregator : ThreadSafeRefCounted<CallbackAggregator> {
explicit CallbackAggregator (std::function<void ()> completionHandler)
: completionHandler(WTF::move(completionHandler))
{
@@ -689,6 +723,25 @@
}
#endif
+ if (dataTypes & WebsiteDataTypeMediaKeys && isPersistent()) {
+ StringCapture mediaKeysStorageDirectory { m_mediaKeysStorageDirectory };
+ HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
+ for (const auto& dataRecord : dataRecords) {
+ for (const auto& origin : dataRecord.origins)
+ origins.add(origin);
+ }
+
+ callbackAggregator->addPendingCallback();
+ m_queue->dispatch([mediaKeysStorageDirectory, callbackAggregator, origins] {
+
+ removeMediaKeys(mediaKeysStorageDirectory.string(), origins);
+
+ RunLoop::main().dispatch([callbackAggregator] {
+ callbackAggregator->removePendingCallback();
+ });
+ });
+ }
+
// There's a chance that we don't have any pending callbacks. If so, we want to dispatch the completion handler right away.
callbackAggregator->callIfNeeded();
}
@@ -756,4 +809,60 @@
return processPools;
}
+Vector<RefPtr<WebCore::SecurityOrigin>> WebsiteDataStore::mediaKeyOrigins(const String& mediaKeysStorageDirectory)
+{
+ ASSERT(!mediaKeysStorageDirectory.isEmpty());
+
+ Vector<RefPtr<WebCore::SecurityOrigin>> origins;
+
+ for (const auto& originPath : WebCore::listDirectory(mediaKeysStorageDirectory, "*")) {
+ auto mediaKeyIdentifier = WebCore::pathGetFileName(originPath);
+
+ if (auto securityOrigin = WebCore::SecurityOrigin::maybeCreateFromDatabaseIdentifier(mediaKeyIdentifier))
+ origins.append(WTF::move(securityOrigin));
+ }
+
+ return origins;
}
+
+static String computeMediaKeyFile(const String& mediaKeyDirectory)
+{
+ return WebCore::pathByAppendingComponent(mediaKeyDirectory, "SecureStop.plist");
+}
+
+void WebsiteDataStore::removeMediaKeys(const String& mediaKeysStorageDirectory, std::chrono::system_clock::time_point modifiedSince)
+{
+ ASSERT(!mediaKeysStorageDirectory.isEmpty());
+
+ for (const auto& mediaKeyDirectory : WebCore::listDirectory(mediaKeysStorageDirectory, "*")) {
+ auto mediaKeyFile = computeMediaKeyFile(mediaKeyDirectory);
+
+ if (!WebCore::fileExists(mediaKeyFile))
+ continue;
+
+ time_t modificationTime;
+ if (!WebCore::getFileModificationTime(mediaKeyFile, modificationTime))
+ continue;
+
+ if (std::chrono::system_clock::from_time_t(modificationTime) < modifiedSince)
+ continue;
+
+ WebCore::deleteFile(mediaKeyFile);
+ WebCore::deleteEmptyDirectory(mediaKeyDirectory);
+ }
+}
+
+void WebsiteDataStore::removeMediaKeys(const String& mediaKeysStorageDirectory, const HashSet<RefPtr<WebCore::SecurityOrigin>>& origins)
+{
+ ASSERT(!mediaKeysStorageDirectory.isEmpty());
+
+ for (const auto& origin : origins) {
+ auto mediaKeyDirectory = WebCore::pathByAppendingComponent(mediaKeysStorageDirectory, origin->databaseIdentifier());
+ auto mediaKeyFile = WebCore::pathByAppendingComponent(mediaKeyDirectory, "SecureStop.plist");
+
+ WebCore::deleteFile(mediaKeyFile);
+ WebCore::deleteEmptyDirectory(mediaKeyDirectory);
+ }
+}
+
+}
Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h (184911 => 184912)
--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2015-05-27 18:39:07 UTC (rev 184911)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2015-05-27 18:53:49 UTC (rev 184912)
@@ -28,6 +28,7 @@
#include "WebProcessLifetimeObserver.h"
#include "WebsiteDataTypes.h"
+#include <WebCore/SecurityOriginHash.h>
#include <WebCore/SessionID.h>
#include <functional>
#include <wtf/HashSet.h>
@@ -36,6 +37,10 @@
#include <wtf/WorkQueue.h>
#include <wtf/text/WTFString.h>
+namespace WebCore {
+class SecurityOrigin;
+}
+
namespace WebKit {
class StorageManager;
@@ -51,6 +56,7 @@
String webSQLDatabaseDirectory;
String localStorageDirectory;
+ String mediaKeysStorageDirectory;
};
static RefPtr<WebsiteDataStore> createNonPersistent();
static RefPtr<WebsiteDataStore> create(Configuration);
@@ -86,6 +92,10 @@
HashSet<RefPtr<WebProcessPool>> processPools() const;
+ static Vector<RefPtr<WebCore::SecurityOrigin>> mediaKeyOrigins(const String& mediaKeysStorageDirectory);
+ static void removeMediaKeys(const String& mediaKeysStorageDirectory, std::chrono::system_clock::time_point modifiedSince);
+ static void removeMediaKeys(const String& mediaKeysStorageDirectory, const HashSet<RefPtr<WebCore::SecurityOrigin>>&);
+
const uint64_t m_identifier;
const WebCore::SessionID m_sessionID;
@@ -93,6 +103,7 @@
const String m_applicationCacheDirectory;
const String m_webSQLDatabaseDirectory;
+ const String m_mediaKeysStorageDirectory;
const RefPtr<StorageManager> m_storageManager;
Ref<WorkQueue> m_queue;
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (184911 => 184912)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-27 18:39:07 UTC (rev 184911)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-27 18:53:49 UTC (rev 184912)
@@ -358,6 +358,7 @@
1AA576021496B97900A4EE06 /* EventDispatcherMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AA575FF1496B7C000A4EE06 /* EventDispatcherMessageReceiver.cpp */; };
1AA5889211EE70400061B882 /* NetscapePluginStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA5889011EE70400061B882 /* NetscapePluginStream.h */; };
1AA5889311EE70400061B882 /* NetscapePluginStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AA5889111EE70400061B882 /* NetscapePluginStream.cpp */; };
+ 1AA654D11B14F71400BF1D3E /* WKWebsiteDataRecordPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA654D01B14F71400BF1D3E /* WKWebsiteDataRecordPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
1AA83F6C1A5B63FF00026EC6 /* WebDatabaseProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AA83F6A1A5B63FF00026EC6 /* WebDatabaseProvider.cpp */; };
1AA83F6D1A5B63FF00026EC6 /* WebDatabaseProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA83F6B1A5B63FF00026EC6 /* WebDatabaseProvider.h */; };
1AA9BAE1184FFAC7003B6BC6 /* WeakObjCPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA9BAE0184FFAC7003B6BC6 /* WeakObjCPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2502,6 +2503,7 @@
1AA576001496B7C000A4EE06 /* EventDispatcherMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventDispatcherMessages.h; sourceTree = "<group>"; };
1AA5889011EE70400061B882 /* NetscapePluginStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetscapePluginStream.h; sourceTree = "<group>"; };
1AA5889111EE70400061B882 /* NetscapePluginStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetscapePluginStream.cpp; sourceTree = "<group>"; };
+ 1AA654D01B14F71400BF1D3E /* WKWebsiteDataRecordPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebsiteDataRecordPrivate.h; sourceTree = "<group>"; };
1AA83F6A1A5B63FF00026EC6 /* WebDatabaseProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDatabaseProvider.cpp; sourceTree = "<group>"; };
1AA83F6B1A5B63FF00026EC6 /* WebDatabaseProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDatabaseProvider.h; sourceTree = "<group>"; };
1AA9BAE0184FFAC7003B6BC6 /* WeakObjCPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeakObjCPtr.h; sourceTree = "<group>"; };
@@ -5448,6 +5450,7 @@
1AAF089C19267FC800B6390C /* WKUserScriptInternal.h */,
1A4832CA1A9BC465008B4DFE /* WKWebsiteDataRecord.h */,
1A4832C91A9BC465008B4DFE /* WKWebsiteDataRecord.mm */,
+ 1AA654D01B14F71400BF1D3E /* WKWebsiteDataRecordPrivate.h */,
1A4832CD1A9BC484008B4DFE /* WKWebsiteDataRecordInternal.h */,
75A8D2C4187CCF9F00C39C9E /* WKWebsiteDataStore.h */,
75A8D2C5187CCF9F00C39C9E /* WKWebsiteDataStore.mm */,
@@ -8087,6 +8090,7 @@
1CA8B946127C882A00576C2B /* WebInspectorProxyMessages.h in Headers */,
1C891D6619B124FF00BA79DD /* WebInspectorUI.h in Headers */,
1CBBE4A119B66C53006B7D81 /* WebInspectorUIMessages.h in Headers */,
+ 1AA654D11B14F71400BF1D3E /* WKWebsiteDataRecordPrivate.h in Headers */,
2DA944A01884E4F000ED86DB /* WebIOSEventFactory.h in Headers */,
51A9E1061315CCFC009E7031 /* WebKeyValueStorageManager.h in Headers */,
1A6280C51919949F006AD9F9 /* WebKit.h in Headers */,
