Diff
Modified: trunk/Source/WebKit/ChangeLog (250145 => 250146)
--- trunk/Source/WebKit/ChangeLog 2019-09-20 20:21:22 UTC (rev 250145)
+++ trunk/Source/WebKit/ChangeLog 2019-09-20 20:29:24 UTC (rev 250146)
@@ -1,5 +1,38 @@
2019-09-20 Alex Christensen <achristen...@webkit.org>
+ Deprecate unused C API aliases for WebsiteDataStore
+ https://bugs.webkit.org/show_bug.cgi?id=202029
+
+ Reviewed by Chris Dumez.
+
+ This is a piece of r249768.
+
+ * UIProcess/API/C/WKApplicationCacheManager.cpp:
+ (WKApplicationCacheManagerGetTypeID):
+ (WKApplicationCacheManagerGetApplicationCacheOrigins):
+ (WKApplicationCacheManagerDeleteEntriesForOrigin):
+ (WKApplicationCacheManagerDeleteAllEntries):
+ * UIProcess/API/C/WKApplicationCacheManager.h:
+ * UIProcess/API/C/WKKeyValueStorageManager.cpp:
+ (WKKeyValueStorageManagerGetTypeID):
+ (WKKeyValueStorageManagerGetOriginKey):
+ (WKKeyValueStorageManagerGetCreationTimeKey):
+ (WKKeyValueStorageManagerGetModificationTimeKey):
+ (WKKeyValueStorageManagerGetKeyValueStorageOrigins):
+ (WKKeyValueStorageManagerGetStorageDetailsByOrigin):
+ (WKKeyValueStorageManagerDeleteEntriesForOrigin):
+ (WKKeyValueStorageManagerDeleteAllEntries):
+ * UIProcess/API/C/WKKeyValueStorageManager.h:
+ * UIProcess/API/C/WKResourceCacheManager.cpp:
+ (WKResourceCacheManagerGetTypeID):
+ (WKResourceCacheManagerGetCacheOrigins):
+ (WKResourceCacheManagerClearCacheForOrigin):
+ (WKResourceCacheManagerClearCacheForAllOrigins):
+ (toWebsiteDataTypes): Deleted.
+ * UIProcess/API/C/WKResourceCacheManager.h:
+
+2019-09-20 Alex Christensen <achristen...@webkit.org>
+
Remove functionality to disable TLS fallback
https://bugs.webkit.org/show_bug.cgi?id=201998
Modified: trunk/Source/WebKit/UIProcess/API/C/WKApplicationCacheManager.cpp (250145 => 250146)
--- trunk/Source/WebKit/UIProcess/API/C/WKApplicationCacheManager.cpp 2019-09-20 20:21:22 UTC (rev 250145)
+++ trunk/Source/WebKit/UIProcess/API/C/WKApplicationCacheManager.cpp 2019-09-20 20:29:24 UTC (rev 250146)
@@ -26,42 +26,19 @@
#include "config.h"
#include "WKApplicationCacheManager.h"
-#include "APIArray.h"
-#include "APIWebsiteDataStore.h"
-#include "WKAPICast.h"
-#include "WebsiteDataRecord.h"
-
WKTypeID WKApplicationCacheManagerGetTypeID()
{
- return WebKit::toAPI(API::WebsiteDataStore::APIType);
+ return 0;
}
-void WKApplicationCacheManagerGetApplicationCacheOrigins(WKApplicationCacheManagerRef applicationCacheManager, void* context, WKApplicationCacheManagerGetApplicationCacheOriginsFunction callback)
+void WKApplicationCacheManagerGetApplicationCacheOrigins(WKApplicationCacheManagerRef, void*, WKApplicationCacheManagerGetApplicationCacheOriginsFunction)
{
- auto& websiteDataStore = WebKit::toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(applicationCacheManager))->websiteDataStore();
- websiteDataStore.fetchData(WebKit::WebsiteDataType::OfflineWebApplicationCache, { }, [context, callback](auto dataRecords) {
- Vector<RefPtr<API::Object>> securityOrigins;
- for (const auto& dataRecord : dataRecords) {
- for (const auto& origin : dataRecord.origins)
- securityOrigins.append(API::SecurityOrigin::create(origin.securityOrigin()));
- }
-
- callback(WebKit::toAPI(API::Array::create(WTFMove(securityOrigins)).ptr()), nullptr, context);
- });
}
-void WKApplicationCacheManagerDeleteEntriesForOrigin(WKApplicationCacheManagerRef applicationCacheManager, WKSecurityOriginRef origin)
+void WKApplicationCacheManagerDeleteEntriesForOrigin(WKApplicationCacheManagerRef, WKSecurityOriginRef)
{
- auto& websiteDataStore = WebKit::toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(applicationCacheManager))->websiteDataStore();
-
- WebKit::WebsiteDataRecord dataRecord;
- dataRecord.add(WebKit::WebsiteDataType::OfflineWebApplicationCache, WebKit::toImpl(origin)->securityOrigin().data());
-
- websiteDataStore.removeData(WebKit::WebsiteDataType::OfflineWebApplicationCache, { dataRecord }, [] { });
}
-void WKApplicationCacheManagerDeleteAllEntries(WKApplicationCacheManagerRef applicationCacheManager)
+void WKApplicationCacheManagerDeleteAllEntries(WKApplicationCacheManagerRef)
{
- auto& websiteDataStore = WebKit::toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(applicationCacheManager))->websiteDataStore();
- websiteDataStore.removeData(WebKit::WebsiteDataType::OfflineWebApplicationCache, -WallTime::infinity(), [] { });
}
Modified: trunk/Source/WebKit/UIProcess/API/C/WKApplicationCacheManager.h (250145 => 250146)
--- trunk/Source/WebKit/UIProcess/API/C/WKApplicationCacheManager.h 2019-09-20 20:21:22 UTC (rev 250145)
+++ trunk/Source/WebKit/UIProcess/API/C/WKApplicationCacheManager.h 2019-09-20 20:29:24 UTC (rev 250146)
@@ -27,18 +27,19 @@
#define WKApplicationCacheManager_h
#include <WebKit/WKBase.h>
+#include <WebKit/WKDeprecated.h>
#ifdef __cplusplus
extern "C" {
#endif
-WK_EXPORT WKTypeID WKApplicationCacheManagerGetTypeID();
+WK_EXPORT WKTypeID WKApplicationCacheManagerGetTypeID() WK_C_API_DEPRECATED;
typedef void (*WKApplicationCacheManagerGetApplicationCacheOriginsFunction)(WKArrayRef, WKErrorRef, void*);
-WK_EXPORT void WKApplicationCacheManagerGetApplicationCacheOrigins(WKApplicationCacheManagerRef applicationCacheManager, void* context, WKApplicationCacheManagerGetApplicationCacheOriginsFunction function);
+WK_EXPORT void WKApplicationCacheManagerGetApplicationCacheOrigins(WKApplicationCacheManagerRef applicationCacheManager, void* context, WKApplicationCacheManagerGetApplicationCacheOriginsFunction function) WK_C_API_DEPRECATED;
-WK_EXPORT void WKApplicationCacheManagerDeleteEntriesForOrigin(WKApplicationCacheManagerRef applicationCacheManager, WKSecurityOriginRef origin);
-WK_EXPORT void WKApplicationCacheManagerDeleteAllEntries(WKApplicationCacheManagerRef applicationCacheManager);
+WK_EXPORT void WKApplicationCacheManagerDeleteEntriesForOrigin(WKApplicationCacheManagerRef applicationCacheManager, WKSecurityOriginRef origin) WK_C_API_DEPRECATED;
+WK_EXPORT void WKApplicationCacheManagerDeleteAllEntries(WKApplicationCacheManagerRef applicationCacheManager) WK_C_API_DEPRECATED;
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit/UIProcess/API/C/WKKeyValueStorageManager.cpp (250145 => 250146)
--- trunk/Source/WebKit/UIProcess/API/C/WKKeyValueStorageManager.cpp 2019-09-20 20:21:22 UTC (rev 250145)
+++ trunk/Source/WebKit/UIProcess/API/C/WKKeyValueStorageManager.cpp 2019-09-20 20:29:24 UTC (rev 250146)
@@ -26,90 +26,38 @@
#include "config.h"
#include "WKKeyValueStorageManager.h"
-#include "APIArray.h"
-#include "APIDictionary.h"
-#include "APIWebsiteDataStore.h"
-#include "StorageManager.h"
-#include "WKAPICast.h"
-#include "WebsiteDataRecord.h"
-#include "WebsiteDataStore.h"
-#include <wtf/RunLoop.h>
-
-using namespace WebKit;
-
WKTypeID WKKeyValueStorageManagerGetTypeID()
{
- return toAPI(API::WebsiteDataStore::APIType);
+ return 0;
}
WKStringRef WKKeyValueStorageManagerGetOriginKey()
{
- static API::String& key = API::String::create("WebKeyValueStorageManagerStorageDetailsOriginKey").leakRef();
- return toAPI(&key);
+ return nullptr;
}
WKStringRef WKKeyValueStorageManagerGetCreationTimeKey()
{
- static API::String& key = API::String::create("WebKeyValueStorageManagerStorageDetailsCreationTimeKey").leakRef();
- return toAPI(&key);
+ return nullptr;
}
WKStringRef WKKeyValueStorageManagerGetModificationTimeKey()
{
- static API::String& key = API::String::create("WebKeyValueStorageManagerStorageDetailsModificationTimeKey").leakRef();
- return toAPI(&key);
+ return nullptr;
}
-void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction callback)
-
+void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef, void*, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction)
{
- auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(keyValueStorageManager))->websiteDataStore();
- websiteDataStore.fetchData({ WebsiteDataType::LocalStorage, WebsiteDataType::SessionStorage }, { }, [context, callback](auto dataRecords) {
- Vector<RefPtr<API::Object>> securityOrigins;
- for (const auto& dataRecord : dataRecords) {
- for (const auto& origin : dataRecord.origins)
- securityOrigins.append(API::SecurityOrigin::create(origin.securityOrigin()));
- }
-
- callback(toAPI(API::Array::create(WTFMove(securityOrigins)).ptr()), nullptr, context);
- });
}
-void WKKeyValueStorageManagerGetStorageDetailsByOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetStorageDetailsByOriginFunction callback)
+void WKKeyValueStorageManagerGetStorageDetailsByOrigin(WKKeyValueStorageManagerRef, void*, WKKeyValueStorageManagerGetStorageDetailsByOriginFunction)
{
- auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(keyValueStorageManager))->websiteDataStore();
- websiteDataStore.getLocalStorageDetails([context, callback](auto&& details) {
- Vector<RefPtr<API::Object>> result;
- result.reserveInitialCapacity(details.size());
-
- for (const auto& detail : details) {
- HashMap<String, RefPtr<API::Object>> detailMap;
- RefPtr<API::Object> origin = API::SecurityOrigin::create(WebCore::SecurityOriginData::fromDatabaseIdentifier(detail.originIdentifier)->securityOrigin());
-
- detailMap.set(toImpl(WKKeyValueStorageManagerGetOriginKey())->string(), origin);
- if (detail.creationTime)
- detailMap.set(toImpl(WKKeyValueStorageManagerGetCreationTimeKey())->string(), API::Double::create(detail.creationTime->secondsSinceEpoch().value()));
- if (detail.modificationTime)
- detailMap.set(toImpl(WKKeyValueStorageManagerGetModificationTimeKey())->string(), API::Double::create(detail.modificationTime->secondsSinceEpoch().value()));
-
- result.uncheckedAppend(API::Dictionary::create(WTFMove(detailMap)));
- }
-
- callback(toAPI(API::Array::create(WTFMove(result)).ptr()), nullptr, context);
- });
}
-void WKKeyValueStorageManagerDeleteEntriesForOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, WKSecurityOriginRef origin)
+void WKKeyValueStorageManagerDeleteEntriesForOrigin(WKKeyValueStorageManagerRef, WKSecurityOriginRef)
{
- auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(keyValueStorageManager))->websiteDataStore();
- WebsiteDataRecord dataRecord;
- dataRecord.add(WebsiteDataType::LocalStorage, toImpl(origin)->securityOrigin().data());
- dataRecord.add(WebsiteDataType::SessionStorage, toImpl(origin)->securityOrigin().data());
- websiteDataStore.removeData({ WebsiteDataType::LocalStorage, WebsiteDataType::SessionStorage }, { dataRecord }, [] { });
}
-void WKKeyValueStorageManagerDeleteAllEntries(WKKeyValueStorageManagerRef keyValueStorageManager)
+void WKKeyValueStorageManagerDeleteAllEntries(WKKeyValueStorageManagerRef)
{
- auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(keyValueStorageManager))->websiteDataStore();
- websiteDataStore.removeData({ WebsiteDataType::LocalStorage, WebsiteDataType::SessionStorage }, -WallTime::infinity(), [] { });
}
Modified: trunk/Source/WebKit/UIProcess/API/C/WKKeyValueStorageManager.h (250145 => 250146)
--- trunk/Source/WebKit/UIProcess/API/C/WKKeyValueStorageManager.h 2019-09-20 20:21:22 UTC (rev 250145)
+++ trunk/Source/WebKit/UIProcess/API/C/WKKeyValueStorageManager.h 2019-09-20 20:29:24 UTC (rev 250146)
@@ -27,30 +27,31 @@
#define WKKeyValueStorageManager_h
#include <WebKit/WKBase.h>
+#include <WebKit/WKDeprecated.h>
#ifdef __cplusplus
extern "C" {
#endif
-WK_EXPORT WKTypeID WKKeyValueStorageManagerGetTypeID();
+WK_EXPORT WKTypeID WKKeyValueStorageManagerGetTypeID() WK_C_API_DEPRECATED;
/* Value type: WKSecurityOriginRef */
-WK_EXPORT WKStringRef WKKeyValueStorageManagerGetOriginKey();
+WK_EXPORT WKStringRef WKKeyValueStorageManagerGetOriginKey() WK_C_API_DEPRECATED;
/* Value type: WKDoubleRef, seconds since January 1st, 1970 UTC */
-WK_EXPORT WKStringRef WKKeyValueStorageManagerGetCreationTimeKey();
+WK_EXPORT WKStringRef WKKeyValueStorageManagerGetCreationTimeKey() WK_C_API_DEPRECATED;
/* Value type: WKDoubleRef, seconds since January 1st, 1970 UTC */
-WK_EXPORT WKStringRef WKKeyValueStorageManagerGetModificationTimeKey();
+WK_EXPORT WKStringRef WKKeyValueStorageManagerGetModificationTimeKey() WK_C_API_DEPRECATED;
typedef void (*WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction)(WKArrayRef, WKErrorRef, void*);
-WK_EXPORT void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction function);
+WK_EXPORT void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction function) WK_C_API_DEPRECATED;
typedef void (*WKKeyValueStorageManagerGetStorageDetailsByOriginFunction)(WKArrayRef, WKErrorRef, void*);
-WK_EXPORT void WKKeyValueStorageManagerGetStorageDetailsByOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetStorageDetailsByOriginFunction function);
+WK_EXPORT void WKKeyValueStorageManagerGetStorageDetailsByOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetStorageDetailsByOriginFunction function) WK_C_API_DEPRECATED;
-WK_EXPORT void WKKeyValueStorageManagerDeleteEntriesForOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, WKSecurityOriginRef origin);
-WK_EXPORT void WKKeyValueStorageManagerDeleteAllEntries(WKKeyValueStorageManagerRef keyValueStorageManager);
+WK_EXPORT void WKKeyValueStorageManagerDeleteEntriesForOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, WKSecurityOriginRef origin) WK_C_API_DEPRECATED;
+WK_EXPORT void WKKeyValueStorageManagerDeleteAllEntries(WKKeyValueStorageManagerRef keyValueStorageManager) WK_C_API_DEPRECATED;
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit/UIProcess/API/C/WKResourceCacheManager.cpp (250145 => 250146)
--- trunk/Source/WebKit/UIProcess/API/C/WKResourceCacheManager.cpp 2019-09-20 20:21:22 UTC (rev 250145)
+++ trunk/Source/WebKit/UIProcess/API/C/WKResourceCacheManager.cpp 2019-09-20 20:29:24 UTC (rev 250146)
@@ -26,67 +26,19 @@
#include "config.h"
#include "WKResourceCacheManager.h"
-#include "APIArray.h"
-#include "APIWebsiteDataStore.h"
-#include "WKAPICast.h"
-#include "WebsiteDataRecord.h"
-
-using namespace WebKit;
-
WKTypeID WKResourceCacheManagerGetTypeID()
{
- return toAPI(API::WebsiteDataStore::APIType);
+ return 0;
}
-static OptionSet<WebsiteDataType> toWebsiteDataTypes(WKResourceCachesToClear cachesToClear)
+void WKResourceCacheManagerGetCacheOrigins(WKResourceCacheManagerRef, void*, WKResourceCacheManagerGetCacheOriginsFunction)
{
- OptionSet<WebsiteDataType> websiteDataTypes { WebsiteDataType::MemoryCache };
-
- if (cachesToClear == WKResourceCachesToClearAll)
- websiteDataTypes.add(WebsiteDataType::DiskCache);
-
- return websiteDataTypes;
}
-void WKResourceCacheManagerGetCacheOrigins(WKResourceCacheManagerRef cacheManager, void* context, WKResourceCacheManagerGetCacheOriginsFunction callback)
+void WKResourceCacheManagerClearCacheForOrigin(WKResourceCacheManagerRef, WKSecurityOriginRef, WKResourceCachesToClear)
{
- auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(cacheManager))->websiteDataStore();
- websiteDataStore.fetchData(toWebsiteDataTypes(WKResourceCachesToClearAll), { }, [context, callback](auto dataRecords) {
- Vector<RefPtr<API::Object>> securityOrigins;
- for (const auto& dataRecord : dataRecords) {
- for (const auto& origin : dataRecord.origins)
- securityOrigins.append(API::SecurityOrigin::create(origin.securityOrigin()));
- }
-
- callback(toAPI(API::Array::create(WTFMove(securityOrigins)).ptr()), nullptr, context);
- });
}
-void WKResourceCacheManagerClearCacheForOrigin(WKResourceCacheManagerRef cacheManager, WKSecurityOriginRef origin, WKResourceCachesToClear cachesToClear)
+void WKResourceCacheManagerClearCacheForAllOrigins(WKResourceCacheManagerRef, WKResourceCachesToClear)
{
- auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(cacheManager))->websiteDataStore();
-
- Vector<WebsiteDataRecord> dataRecords;
-
- {
- WebsiteDataRecord dataRecord;
- dataRecord.add(WebsiteDataType::MemoryCache, toImpl(origin)->securityOrigin().data());
-
- dataRecords.append(dataRecord);
- }
-
- if (cachesToClear == WKResourceCachesToClearAll) {
- WebsiteDataRecord dataRecord;
- dataRecord.add(WebsiteDataType::DiskCache, toImpl(origin)->securityOrigin().data());
-
- 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), -WallTime::infinity(), [] { });
-}
Modified: trunk/Source/WebKit/UIProcess/API/C/WKResourceCacheManager.h (250145 => 250146)
--- trunk/Source/WebKit/UIProcess/API/C/WKResourceCacheManager.h 2019-09-20 20:21:22 UTC (rev 250145)
+++ trunk/Source/WebKit/UIProcess/API/C/WKResourceCacheManager.h 2019-09-20 20:29:24 UTC (rev 250146)
@@ -27,6 +27,7 @@
#define WKResourceCacheManager_h
#include <WebKit/WKBase.h>
+#include <WebKit/WKDeprecated.h>
#ifdef __cplusplus
extern "C" {
@@ -38,13 +39,13 @@
};
typedef uint32_t WKResourceCachesToClear;
-WK_EXPORT WKTypeID WKResourceCacheManagerGetTypeID();
+WK_EXPORT WKTypeID WKResourceCacheManagerGetTypeID() WK_C_API_DEPRECATED;
typedef void (*WKResourceCacheManagerGetCacheOriginsFunction)(WKArrayRef, WKErrorRef, void*);
-WK_EXPORT void WKResourceCacheManagerGetCacheOrigins(WKResourceCacheManagerRef contextRef, void* context, WKResourceCacheManagerGetCacheOriginsFunction function);
+WK_EXPORT void WKResourceCacheManagerGetCacheOrigins(WKResourceCacheManagerRef contextRef, void* context, WKResourceCacheManagerGetCacheOriginsFunction function) WK_C_API_DEPRECATED;
-WK_EXPORT void WKResourceCacheManagerClearCacheForOrigin(WKResourceCacheManagerRef cacheManger, WKSecurityOriginRef origin, WKResourceCachesToClear cachesToClear);
-WK_EXPORT void WKResourceCacheManagerClearCacheForAllOrigins(WKResourceCacheManagerRef cacheManager, WKResourceCachesToClear cachesToClear);
+WK_EXPORT void WKResourceCacheManagerClearCacheForOrigin(WKResourceCacheManagerRef cacheManger, WKSecurityOriginRef origin, WKResourceCachesToClear cachesToClear) WK_C_API_DEPRECATED;
+WK_EXPORT void WKResourceCacheManagerClearCacheForAllOrigins(WKResourceCacheManagerRef cacheManager, WKResourceCachesToClear cachesToClear) WK_C_API_DEPRECATED;
#ifdef __cplusplus
}
