Changeset 250146 in webkit
- Timestamp:
- Sep 20, 2019, 1:29:24 PM (6 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r250144 r250146 1 2019-09-20 Alex Christensen <achristensen@webkit.org> 2 3 Deprecate unused C API aliases for WebsiteDataStore 4 https://bugs.webkit.org/show_bug.cgi?id=202029 5 6 Reviewed by Chris Dumez. 7 8 This is a piece of r249768. 9 10 * UIProcess/API/C/WKApplicationCacheManager.cpp: 11 (WKApplicationCacheManagerGetTypeID): 12 (WKApplicationCacheManagerGetApplicationCacheOrigins): 13 (WKApplicationCacheManagerDeleteEntriesForOrigin): 14 (WKApplicationCacheManagerDeleteAllEntries): 15 * UIProcess/API/C/WKApplicationCacheManager.h: 16 * UIProcess/API/C/WKKeyValueStorageManager.cpp: 17 (WKKeyValueStorageManagerGetTypeID): 18 (WKKeyValueStorageManagerGetOriginKey): 19 (WKKeyValueStorageManagerGetCreationTimeKey): 20 (WKKeyValueStorageManagerGetModificationTimeKey): 21 (WKKeyValueStorageManagerGetKeyValueStorageOrigins): 22 (WKKeyValueStorageManagerGetStorageDetailsByOrigin): 23 (WKKeyValueStorageManagerDeleteEntriesForOrigin): 24 (WKKeyValueStorageManagerDeleteAllEntries): 25 * UIProcess/API/C/WKKeyValueStorageManager.h: 26 * UIProcess/API/C/WKResourceCacheManager.cpp: 27 (WKResourceCacheManagerGetTypeID): 28 (WKResourceCacheManagerGetCacheOrigins): 29 (WKResourceCacheManagerClearCacheForOrigin): 30 (WKResourceCacheManagerClearCacheForAllOrigins): 31 (toWebsiteDataTypes): Deleted. 32 * UIProcess/API/C/WKResourceCacheManager.h: 33 1 34 2019-09-20 Alex Christensen <achristensen@webkit.org> 2 35 -
trunk/Source/WebKit/UIProcess/API/C/WKApplicationCacheManager.cpp
r249778 r250146 27 27 #include "WKApplicationCacheManager.h" 28 28 29 #include "APIArray.h"30 #include "APIWebsiteDataStore.h"31 #include "WKAPICast.h"32 #include "WebsiteDataRecord.h"33 34 29 WKTypeID WKApplicationCacheManagerGetTypeID() 35 30 { 36 return WebKit::toAPI(API::WebsiteDataStore::APIType);31 return 0; 37 32 } 38 33 39 void WKApplicationCacheManagerGetApplicationCacheOrigins(WKApplicationCacheManagerRef applicationCacheManager, void* context, WKApplicationCacheManagerGetApplicationCacheOriginsFunction callback)34 void WKApplicationCacheManagerGetApplicationCacheOrigins(WKApplicationCacheManagerRef, void*, WKApplicationCacheManagerGetApplicationCacheOriginsFunction) 40 35 { 41 auto& websiteDataStore = WebKit::toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(applicationCacheManager))->websiteDataStore();42 websiteDataStore.fetchData(WebKit::WebsiteDataType::OfflineWebApplicationCache, { }, [context, callback](auto dataRecords) {43 Vector<RefPtr<API::Object>> securityOrigins;44 for (const auto& dataRecord : dataRecords) {45 for (const auto& origin : dataRecord.origins)46 securityOrigins.append(API::SecurityOrigin::create(origin.securityOrigin()));47 }48 49 callback(WebKit::toAPI(API::Array::create(WTFMove(securityOrigins)).ptr()), nullptr, context);50 });51 36 } 52 37 53 void WKApplicationCacheManagerDeleteEntriesForOrigin(WKApplicationCacheManagerRef applicationCacheManager, WKSecurityOriginRef origin)38 void WKApplicationCacheManagerDeleteEntriesForOrigin(WKApplicationCacheManagerRef, WKSecurityOriginRef) 54 39 { 55 auto& websiteDataStore = WebKit::toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(applicationCacheManager))->websiteDataStore();56 57 WebKit::WebsiteDataRecord dataRecord;58 dataRecord.add(WebKit::WebsiteDataType::OfflineWebApplicationCache, WebKit::toImpl(origin)->securityOrigin().data());59 60 websiteDataStore.removeData(WebKit::WebsiteDataType::OfflineWebApplicationCache, { dataRecord }, [] { });61 40 } 62 41 63 void WKApplicationCacheManagerDeleteAllEntries(WKApplicationCacheManagerRef applicationCacheManager)42 void WKApplicationCacheManagerDeleteAllEntries(WKApplicationCacheManagerRef) 64 43 { 65 auto& websiteDataStore = WebKit::toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(applicationCacheManager))->websiteDataStore();66 websiteDataStore.removeData(WebKit::WebsiteDataType::OfflineWebApplicationCache, -WallTime::infinity(), [] { });67 44 } -
trunk/Source/WebKit/UIProcess/API/C/WKApplicationCacheManager.h
r249778 r250146 28 28 29 29 #include <WebKit/WKBase.h> 30 #include <WebKit/WKDeprecated.h> 30 31 31 32 #ifdef __cplusplus … … 33 34 #endif 34 35 35 WK_EXPORT WKTypeID WKApplicationCacheManagerGetTypeID() ;36 WK_EXPORT WKTypeID WKApplicationCacheManagerGetTypeID() WK_C_API_DEPRECATED; 36 37 37 38 typedef void (*WKApplicationCacheManagerGetApplicationCacheOriginsFunction)(WKArrayRef, WKErrorRef, void*); 38 WK_EXPORT void WKApplicationCacheManagerGetApplicationCacheOrigins(WKApplicationCacheManagerRef applicationCacheManager, void* context, WKApplicationCacheManagerGetApplicationCacheOriginsFunction function) ;39 WK_EXPORT void WKApplicationCacheManagerGetApplicationCacheOrigins(WKApplicationCacheManagerRef applicationCacheManager, void* context, WKApplicationCacheManagerGetApplicationCacheOriginsFunction function) WK_C_API_DEPRECATED; 39 40 40 WK_EXPORT void WKApplicationCacheManagerDeleteEntriesForOrigin(WKApplicationCacheManagerRef applicationCacheManager, WKSecurityOriginRef origin) ;41 WK_EXPORT void WKApplicationCacheManagerDeleteAllEntries(WKApplicationCacheManagerRef applicationCacheManager) ;41 WK_EXPORT void WKApplicationCacheManagerDeleteEntriesForOrigin(WKApplicationCacheManagerRef applicationCacheManager, WKSecurityOriginRef origin) WK_C_API_DEPRECATED; 42 WK_EXPORT void WKApplicationCacheManagerDeleteAllEntries(WKApplicationCacheManagerRef applicationCacheManager) WK_C_API_DEPRECATED; 42 43 43 44 #ifdef __cplusplus -
trunk/Source/WebKit/UIProcess/API/C/WKKeyValueStorageManager.cpp
r249778 r250146 27 27 #include "WKKeyValueStorageManager.h" 28 28 29 #include "APIArray.h"30 #include "APIDictionary.h"31 #include "APIWebsiteDataStore.h"32 #include "StorageManager.h"33 #include "WKAPICast.h"34 #include "WebsiteDataRecord.h"35 #include "WebsiteDataStore.h"36 #include <wtf/RunLoop.h>37 38 using namespace WebKit;39 40 29 WKTypeID WKKeyValueStorageManagerGetTypeID() 41 30 { 42 return toAPI(API::WebsiteDataStore::APIType);31 return 0; 43 32 } 44 33 45 34 WKStringRef WKKeyValueStorageManagerGetOriginKey() 46 35 { 47 static API::String& key = API::String::create("WebKeyValueStorageManagerStorageDetailsOriginKey").leakRef(); 48 return toAPI(&key); 36 return nullptr; 49 37 } 50 38 51 39 WKStringRef WKKeyValueStorageManagerGetCreationTimeKey() 52 40 { 53 static API::String& key = API::String::create("WebKeyValueStorageManagerStorageDetailsCreationTimeKey").leakRef(); 54 return toAPI(&key); 41 return nullptr; 55 42 } 56 43 57 44 WKStringRef WKKeyValueStorageManagerGetModificationTimeKey() 58 45 { 59 static API::String& key = API::String::create("WebKeyValueStorageManagerStorageDetailsModificationTimeKey").leakRef(); 60 return toAPI(&key); 46 return nullptr; 61 47 } 62 48 63 void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction callback) 64 49 void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef, void*, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction) 65 50 { 66 auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(keyValueStorageManager))->websiteDataStore();67 websiteDataStore.fetchData({ WebsiteDataType::LocalStorage, WebsiteDataType::SessionStorage }, { }, [context, callback](auto dataRecords) {68 Vector<RefPtr<API::Object>> securityOrigins;69 for (const auto& dataRecord : dataRecords) {70 for (const auto& origin : dataRecord.origins)71 securityOrigins.append(API::SecurityOrigin::create(origin.securityOrigin()));72 }73 74 callback(toAPI(API::Array::create(WTFMove(securityOrigins)).ptr()), nullptr, context);75 });76 51 } 77 52 78 void WKKeyValueStorageManagerGetStorageDetailsByOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetStorageDetailsByOriginFunction callback)53 void WKKeyValueStorageManagerGetStorageDetailsByOrigin(WKKeyValueStorageManagerRef, void*, WKKeyValueStorageManagerGetStorageDetailsByOriginFunction) 79 54 { 80 auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(keyValueStorageManager))->websiteDataStore();81 websiteDataStore.getLocalStorageDetails([context, callback](auto&& details) {82 Vector<RefPtr<API::Object>> result;83 result.reserveInitialCapacity(details.size());84 85 for (const auto& detail : details) {86 HashMap<String, RefPtr<API::Object>> detailMap;87 RefPtr<API::Object> origin = API::SecurityOrigin::create(WebCore::SecurityOriginData::fromDatabaseIdentifier(detail.originIdentifier)->securityOrigin());88 89 detailMap.set(toImpl(WKKeyValueStorageManagerGetOriginKey())->string(), origin);90 if (detail.creationTime)91 detailMap.set(toImpl(WKKeyValueStorageManagerGetCreationTimeKey())->string(), API::Double::create(detail.creationTime->secondsSinceEpoch().value()));92 if (detail.modificationTime)93 detailMap.set(toImpl(WKKeyValueStorageManagerGetModificationTimeKey())->string(), API::Double::create(detail.modificationTime->secondsSinceEpoch().value()));94 95 result.uncheckedAppend(API::Dictionary::create(WTFMove(detailMap)));96 }97 98 callback(toAPI(API::Array::create(WTFMove(result)).ptr()), nullptr, context);99 });100 55 } 101 56 102 void WKKeyValueStorageManagerDeleteEntriesForOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, WKSecurityOriginRef origin)57 void WKKeyValueStorageManagerDeleteEntriesForOrigin(WKKeyValueStorageManagerRef, WKSecurityOriginRef) 103 58 { 104 auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(keyValueStorageManager))->websiteDataStore();105 WebsiteDataRecord dataRecord;106 dataRecord.add(WebsiteDataType::LocalStorage, toImpl(origin)->securityOrigin().data());107 dataRecord.add(WebsiteDataType::SessionStorage, toImpl(origin)->securityOrigin().data());108 websiteDataStore.removeData({ WebsiteDataType::LocalStorage, WebsiteDataType::SessionStorage }, { dataRecord }, [] { });109 59 } 110 60 111 void WKKeyValueStorageManagerDeleteAllEntries(WKKeyValueStorageManagerRef keyValueStorageManager)61 void WKKeyValueStorageManagerDeleteAllEntries(WKKeyValueStorageManagerRef) 112 62 { 113 auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(keyValueStorageManager))->websiteDataStore();114 websiteDataStore.removeData({ WebsiteDataType::LocalStorage, WebsiteDataType::SessionStorage }, -WallTime::infinity(), [] { });115 63 } -
trunk/Source/WebKit/UIProcess/API/C/WKKeyValueStorageManager.h
r249778 r250146 28 28 29 29 #include <WebKit/WKBase.h> 30 #include <WebKit/WKDeprecated.h> 30 31 31 32 #ifdef __cplusplus … … 33 34 #endif 34 35 35 WK_EXPORT WKTypeID WKKeyValueStorageManagerGetTypeID() ;36 WK_EXPORT WKTypeID WKKeyValueStorageManagerGetTypeID() WK_C_API_DEPRECATED; 36 37 37 38 /* Value type: WKSecurityOriginRef */ 38 WK_EXPORT WKStringRef WKKeyValueStorageManagerGetOriginKey() ;39 WK_EXPORT WKStringRef WKKeyValueStorageManagerGetOriginKey() WK_C_API_DEPRECATED; 39 40 40 41 /* Value type: WKDoubleRef, seconds since January 1st, 1970 UTC */ 41 WK_EXPORT WKStringRef WKKeyValueStorageManagerGetCreationTimeKey() ;42 WK_EXPORT WKStringRef WKKeyValueStorageManagerGetCreationTimeKey() WK_C_API_DEPRECATED; 42 43 43 44 /* Value type: WKDoubleRef, seconds since January 1st, 1970 UTC */ 44 WK_EXPORT WKStringRef WKKeyValueStorageManagerGetModificationTimeKey() ;45 WK_EXPORT WKStringRef WKKeyValueStorageManagerGetModificationTimeKey() WK_C_API_DEPRECATED; 45 46 46 47 typedef void (*WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction)(WKArrayRef, WKErrorRef, void*); 47 WK_EXPORT void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction function) ;48 WK_EXPORT void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction function) WK_C_API_DEPRECATED; 48 49 49 50 typedef void (*WKKeyValueStorageManagerGetStorageDetailsByOriginFunction)(WKArrayRef, WKErrorRef, void*); 50 WK_EXPORT void WKKeyValueStorageManagerGetStorageDetailsByOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetStorageDetailsByOriginFunction function) ;51 WK_EXPORT void WKKeyValueStorageManagerGetStorageDetailsByOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetStorageDetailsByOriginFunction function) WK_C_API_DEPRECATED; 51 52 52 WK_EXPORT void WKKeyValueStorageManagerDeleteEntriesForOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, WKSecurityOriginRef origin) ;53 WK_EXPORT void WKKeyValueStorageManagerDeleteAllEntries(WKKeyValueStorageManagerRef keyValueStorageManager) ;53 WK_EXPORT void WKKeyValueStorageManagerDeleteEntriesForOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, WKSecurityOriginRef origin) WK_C_API_DEPRECATED; 54 WK_EXPORT void WKKeyValueStorageManagerDeleteAllEntries(WKKeyValueStorageManagerRef keyValueStorageManager) WK_C_API_DEPRECATED; 54 55 55 56 #ifdef __cplusplus -
trunk/Source/WebKit/UIProcess/API/C/WKResourceCacheManager.cpp
r249778 r250146 27 27 #include "WKResourceCacheManager.h" 28 28 29 #include "APIArray.h"30 #include "APIWebsiteDataStore.h"31 #include "WKAPICast.h"32 #include "WebsiteDataRecord.h"33 34 using namespace WebKit;35 36 29 WKTypeID WKResourceCacheManagerGetTypeID() 37 30 { 38 return toAPI(API::WebsiteDataStore::APIType);31 return 0; 39 32 } 40 33 41 static OptionSet<WebsiteDataType> toWebsiteDataTypes(WKResourceCachesToClear cachesToClear)34 void WKResourceCacheManagerGetCacheOrigins(WKResourceCacheManagerRef, void*, WKResourceCacheManagerGetCacheOriginsFunction) 42 35 { 43 OptionSet<WebsiteDataType> websiteDataTypes { WebsiteDataType::MemoryCache };44 45 if (cachesToClear == WKResourceCachesToClearAll)46 websiteDataTypes.add(WebsiteDataType::DiskCache);47 48 return websiteDataTypes;49 36 } 50 37 51 void WKResourceCacheManager GetCacheOrigins(WKResourceCacheManagerRef cacheManager, void* context, WKResourceCacheManagerGetCacheOriginsFunction callback)38 void WKResourceCacheManagerClearCacheForOrigin(WKResourceCacheManagerRef, WKSecurityOriginRef, WKResourceCachesToClear) 52 39 { 53 auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(cacheManager))->websiteDataStore();54 websiteDataStore.fetchData(toWebsiteDataTypes(WKResourceCachesToClearAll), { }, [context, callback](auto dataRecords) {55 Vector<RefPtr<API::Object>> securityOrigins;56 for (const auto& dataRecord : dataRecords) {57 for (const auto& origin : dataRecord.origins)58 securityOrigins.append(API::SecurityOrigin::create(origin.securityOrigin()));59 }60 61 callback(toAPI(API::Array::create(WTFMove(securityOrigins)).ptr()), nullptr, context);62 });63 40 } 64 41 65 void WKResourceCacheManagerClearCacheFor Origin(WKResourceCacheManagerRef cacheManager, WKSecurityOriginRef origin, WKResourceCachesToClear cachesToClear)42 void WKResourceCacheManagerClearCacheForAllOrigins(WKResourceCacheManagerRef, WKResourceCachesToClear) 66 43 { 67 auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(cacheManager))->websiteDataStore();68 69 Vector<WebsiteDataRecord> dataRecords;70 71 {72 WebsiteDataRecord dataRecord;73 dataRecord.add(WebsiteDataType::MemoryCache, toImpl(origin)->securityOrigin().data());74 75 dataRecords.append(dataRecord);76 }77 78 if (cachesToClear == WKResourceCachesToClearAll) {79 WebsiteDataRecord dataRecord;80 dataRecord.add(WebsiteDataType::DiskCache, toImpl(origin)->securityOrigin().data());81 82 dataRecords.append(dataRecord);83 }84 85 websiteDataStore.removeData(toWebsiteDataTypes(cachesToClear), dataRecords, [] { });86 44 } 87 88 void WKResourceCacheManagerClearCacheForAllOrigins(WKResourceCacheManagerRef cacheManager, WKResourceCachesToClear cachesToClear)89 {90 auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(cacheManager))->websiteDataStore();91 websiteDataStore.removeData(toWebsiteDataTypes(cachesToClear), -WallTime::infinity(), [] { });92 } -
trunk/Source/WebKit/UIProcess/API/C/WKResourceCacheManager.h
r249778 r250146 28 28 29 29 #include <WebKit/WKBase.h> 30 #include <WebKit/WKDeprecated.h> 30 31 31 32 #ifdef __cplusplus … … 39 40 typedef uint32_t WKResourceCachesToClear; 40 41 41 WK_EXPORT WKTypeID WKResourceCacheManagerGetTypeID() ;42 WK_EXPORT WKTypeID WKResourceCacheManagerGetTypeID() WK_C_API_DEPRECATED; 42 43 43 44 typedef void (*WKResourceCacheManagerGetCacheOriginsFunction)(WKArrayRef, WKErrorRef, void*); 44 WK_EXPORT void WKResourceCacheManagerGetCacheOrigins(WKResourceCacheManagerRef contextRef, void* context, WKResourceCacheManagerGetCacheOriginsFunction function) ;45 WK_EXPORT void WKResourceCacheManagerGetCacheOrigins(WKResourceCacheManagerRef contextRef, void* context, WKResourceCacheManagerGetCacheOriginsFunction function) WK_C_API_DEPRECATED; 45 46 46 WK_EXPORT void WKResourceCacheManagerClearCacheForOrigin(WKResourceCacheManagerRef cacheManger, WKSecurityOriginRef origin, WKResourceCachesToClear cachesToClear) ;47 WK_EXPORT void WKResourceCacheManagerClearCacheForAllOrigins(WKResourceCacheManagerRef cacheManager, WKResourceCachesToClear cachesToClear) ;47 WK_EXPORT void WKResourceCacheManagerClearCacheForOrigin(WKResourceCacheManagerRef cacheManger, WKSecurityOriginRef origin, WKResourceCachesToClear cachesToClear) WK_C_API_DEPRECATED; 48 WK_EXPORT void WKResourceCacheManagerClearCacheForAllOrigins(WKResourceCacheManagerRef cacheManager, WKResourceCachesToClear cachesToClear) WK_C_API_DEPRECATED; 48 49 49 50 #ifdef __cplusplus
Note:
See TracChangeset
for help on using the changeset viewer.