Changeset 185529 in webkit

Timestamp:

Jun 12, 2015, 6:40:57 PM (11 years ago)

Author:

andersca@apple.com

Message:

Reimplement WKResourceCacheManagerRef on top of WKWebsiteDataStoreRef
​https://bugs.webkit.org/show_bug.cgi?id=145951

Reviewed by Darin Adler.

• UIProcess/API/C/WKContext.cpp:

(WKContextGetResourceCacheManager):

• UIProcess/API/C/WKResourceCacheManager.cpp:

(WKResourceCacheManagerGetTypeID):
(toWebsiteDataTypes):
(WKResourceCacheManagerGetCacheOrigins):
(WKResourceCacheManagerClearCacheForOrigin):
(WKResourceCacheManagerClearCacheForAllOrigins):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/SecurityOriginData.h (modified) (1 diff)
• UIProcess/API/C/WKContext.cpp (modified) (1 diff)
• UIProcess/API/C/WKResourceCacheManager.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-12  Anders Carlsson  <andersca@apple.com>
+
+        Reimplement WKResourceCacheManagerRef on top of WKWebsiteDataStoreRef
+        https://bugs.webkit.org/show_bug.cgi?id=145951
+
+        Reviewed by Darin Adler.
+
+        * UIProcess/API/C/WKContext.cpp:
+        (WKContextGetResourceCacheManager):
+        * UIProcess/API/C/WKResourceCacheManager.cpp:
+        (WKResourceCacheManagerGetTypeID):
+        (toWebsiteDataTypes):
+        (WKResourceCacheManagerGetCacheOrigins):
+        (WKResourceCacheManagerClearCacheForOrigin):
+        (WKResourceCacheManagerClearCacheForAllOrigins):
+
 2015-06-12  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/SecurityOriginData.h

@@ -1 @@
-/*
+ /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *

trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp

@@ -473 +473 @@
 }
 
-WKResourceCacheManagerRef WKContextGetResourceCacheManager(WKContextRef contextRef)
-{
-    return toAPI(toImpl(contextRef)->supplement<WebResourceCacheManagerProxy>());
+WKResourceCacheManagerRef WKContextGetResourceCacheManager(WKContextRef context)
+{
+    return reinterpret_cast<WKResourceCacheManagerRef>(WKContextGetWebsiteDataStore(context));
 }
 

trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp

@@ -27 +27 @@
 #include "WKResourceCacheManager.h"
 
-#include "WebResourceCacheManagerProxy.h"
+#include "APIWebsiteDataStore.h"
 #include "WKAPICast.h"
+#include "WebsiteDataRecord.h"
 
 using namespace WebKit;
@@ -34 +35 @@
 WKTypeID WKResourceCacheManagerGetTypeID()
 {
-    return toAPI(WebResourceCacheManagerProxy::APIType);
+    return toAPI(API::WebsiteDataStore::APIType);
 }
 
-void WKResourceCacheManagerGetCacheOrigins(WKResourceCacheManagerRef cacheManagerRef, void* context, WKResourceCacheManagerGetCacheOriginsFunction callback)
+static WebsiteDataTypes toWebsiteDataTypes(WKResourceCachesToClear cachesToClear)
 {
-    toImpl(cacheManagerRef)->getCacheOrigins(toGenericCallbackFunction(context, callback));
+    using WebsiteDataTypes = WebKit::WebsiteDataTypes;
+
+    int websiteDataTypes = WebsiteDataTypeMemoryCache;
+
+    if (cachesToClear == WKResourceCachesToClearAll)
+        websiteDataTypes |= WebsiteDataTypeDiskCache;
+
+    return static_cast<WebsiteDataTypes>(websiteDataTypes);
 }
 
-void WKResourceCacheManagerClearCacheForOrigin(WKResourceCacheManagerRef cacheManagerRef, WKSecurityOriginRef originRef, WKResourceCachesToClear cachesToClear)
+void WKResourceCacheManagerGetCacheOrigins(WKResourceCacheManagerRef cacheManager, void* context, WKResourceCacheManagerGetCacheOriginsFunction callback)
 {
-    toImpl(cacheManagerRef)->clearCacheForOrigin(toImpl(originRef), toResourceCachesToClear(cachesToClear));
+    auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(cacheManager))->websiteDataStore();
+    websiteDataStore.fetchData(toWebsiteDataTypes(WKResourceCachesToClearAll), [context, callback](Vector<WebsiteDataRecord> dataRecords) {
+        Vector<RefPtr<API::Object>> securityOrigins;
+        for (const auto& dataRecord : dataRecords) {
+            for (const auto& origin : dataRecord.origins)
+                securityOrigins.append(API::SecurityOrigin::create(origin));
+        }
+
+        callback(toAPI(API::Array::create(WTF::move(securityOrigins)).ptr()), nullptr, context);
+    });
 }
 
-void WKResourceCacheManagerClearCacheForAllOrigins(WKResourceCacheManagerRef cacheManagerRef, WKResourceCachesToClear cachesToClear)
+void WKResourceCacheManagerClearCacheForOrigin(WKResourceCacheManagerRef cacheManager, WKSecurityOriginRef origin, WKResourceCachesToClear cachesToClear)
 {
-    toImpl(cacheManagerRef)->clearCacheForAllOrigins(toResourceCachesToClear(cachesToClear));
+    auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(cacheManager))->websiteDataStore();
+
+    Vector<WebsiteDataRecord> dataRecords;
+
+    {
+        WebsiteDataRecord dataRecord;
+        dataRecord.add(WebsiteDataTypes::WebsiteDataTypeMemoryCache, &toImpl(origin)->securityOrigin());
+
+        dataRecords.append(dataRecord);
+    }
+
+    if (cachesToClear == WKResourceCachesToClearAll) {
+        WebsiteDataRecord dataRecord;
+        dataRecord.add(WebsiteDataTypes::WebsiteDataTypeDiskCache, &toImpl(origin)->securityOrigin());
+
+        dataRecords.append(dataRecord);
+    }
+
+    websiteDataStore.removeData(toWebsiteDataTypes(cachesToClear), dataRecords, [] { });
 }
+
+void WKResourceCacheManagerClearCacheForAllOrigins(WKResourceCacheManagerRef cacheManager, WKResourceCachesToClear cachesToClear)
+{
+    auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(cacheManager))->websiteDataStore();
+    websiteDataStore.removeData(toWebsiteDataTypes(cachesToClear), std::chrono::system_clock::time_point::min(), [] { });
+}