webkitgtk-2.4.9webkitgtk-2.4.9

1 files changed, 18 insertions, 44 deletions

diff --git a/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp b/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp
index 582d49ca5..8ab0f37d7 100644
--- a/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp
+++ b/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp
@@ -26,68 +26,42 @@
 #include "config.h"
 #include "WKOriginDataManager.h"
 
-#include "APIWebsiteDataStore.h"
 #include "WKAPICast.h"
-#include "WebsiteDataRecord.h"
+#include "WebOriginDataManagerProxy.h"
 
 using namespace WebKit;
 
 WKTypeID WKOriginDataManagerGetTypeID()
 {
-    return toAPI(API::WebsiteDataStore::APIType);
+    return toAPI(WebOriginDataManagerProxy::APIType);
 }
 
-void WKOriginDataManagerGetOrigins(WKOriginDataManagerRef originDataManager, WKOriginDataTypes types, void* context, WKOriginDataManagerGetOriginsFunction callback)
+void WKOriginDataManagerGetOrigins(WKOriginDataManagerRef originDataManagerRef, WKOriginDataTypes types, void* context, WKOriginDataManagerGetOriginsFunction callback)
 {
-    // This is the only type supported.
-    ASSERT_UNUSED(types, types == kWKIndexedDatabaseData);
-
-    auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(originDataManager))->websiteDataStore();
-    websiteDataStore.fetchData(WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases, [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);
-    });
+    toImpl(originDataManagerRef)->getOrigins(types, ArrayCallback::create(context, callback));
 }
 
-void WKOriginDataManagerDeleteEntriesForOrigin(WKOriginDataManagerRef originDataManager, WKOriginDataTypes types, WKSecurityOriginRef origin, void* context, WKOriginDataManagerDeleteEntriesCallbackFunction callback)
+void WKOriginDataManagerDeleteEntriesForOrigin(WKOriginDataManagerRef originDataManagerRef, WKOriginDataTypes types, WKSecurityOriginRef originRef)
 {
-    // This is the only type supported.
-    ASSERT_UNUSED(types, types == kWKIndexedDatabaseData);
-
-    auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(originDataManager))->websiteDataStore();
-
-    WebsiteDataRecord dataRecord;
-    dataRecord.add(WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases, &toImpl(origin)->securityOrigin());
-
-    websiteDataStore.removeData(WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases, { dataRecord }, [context, callback] {
-        callback(nullptr, context);
-    });
+    toImpl(originDataManagerRef)->deleteEntriesForOrigin(types, toImpl(originRef));
 }
 
-void WKOriginDataManagerDeleteEntriesModifiedBetweenDates(WKOriginDataManagerRef originDataManager, WKOriginDataTypes types, double startDate, double endDate, void* context, WKOriginDataManagerDeleteEntriesCallbackFunction callback)
+void WKOriginDataManagerDeleteAllEntries(WKOriginDataManagerRef originDataManagerRef, WKOriginDataTypes types)
 {
-    // This is the only type supported.
-    ASSERT_UNUSED(types, types == kWKIndexedDatabaseData);
-    UNUSED_PARAM(endDate);
+    toImpl(originDataManagerRef)->deleteAllEntries(types);
+}
 
-    auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(originDataManager))->websiteDataStore();
-    websiteDataStore.removeData(WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases, std::chrono::system_clock::from_time_t(startDate), [context, callback] {
-        callback(nullptr, context);
-    });
+void WKOriginDataManagerStartObservingChanges(WKOriginDataManagerRef originDataManagerRef, WKOriginDataTypes types)
+{
+    toImpl(originDataManagerRef)->startObservingChanges(types);
 }
 
-void WKOriginDataManagerDeleteAllEntries(WKOriginDataManagerRef originDataManager, WKOriginDataTypes types, void* context, WKOriginDataManagerDeleteEntriesCallbackFunction callback)
+void WKOriginDataManagerStopObservingChanges(WKOriginDataManagerRef originDataManagerRef, WKOriginDataTypes types)
 {
-    // This is the only type supported.
-    ASSERT_UNUSED(types, types == kWKIndexedDatabaseData);
+    toImpl(originDataManagerRef)->stopObservingChanges(types);
+}
 
-    auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(originDataManager))->websiteDataStore();
-    websiteDataStore.removeData(WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases, std::chrono::system_clock::time_point::min(), [context, callback] {
-        callback(nullptr, context);
-    });
+void WKOriginDataManagerSetChangeClient(WKOriginDataManagerRef originDataManagerRef, const WKOriginDataManagerChangeClientBase *client)
+{
+    toImpl(originDataManagerRef)->setChangeClient(client);
 }