Diff
Modified: trunk/Source/WebKit/ChangeLog (254341 => 254342)
--- trunk/Source/WebKit/ChangeLog 2020-01-10 16:48:40 UTC (rev 254341)
+++ trunk/Source/WebKit/ChangeLog 2020-01-10 17:40:35 UTC (rev 254342)
@@ -1,3 +1,24 @@
+2020-01-10 Alex Christensen <[email protected]>
+
+ Remove WebsiteDataStore::setCacheStorageDirectory which has been replaced by WebsiteDataStoreConfiguration::setCacheStorageDirectory
+ https://bugs.webkit.org/show_bug.cgi?id=205841
+
+ Reviewed by Youenn Fablet.
+
+ * UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.cpp:
+ (WKWebsiteDataStoreConfigurationCopyCacheStorageDirectory):
+ (WKWebsiteDataStoreConfigurationSetCacheStorageDirectory):
+ * UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.h:
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+ (-[WKWebsiteDataStore _cacheStorageDirectory]): Deleted.
+ (-[WKWebsiteDataStore _setCacheStorageDirectory:]): Deleted.
+ * UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h:
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::retrieveCacheStorageParameters):
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+ (WebKit::WebsiteDataStore::cacheStorageDirectory const):
+ (WebKit::WebsiteDataStore::setCacheStorageDirectory): Deleted.
+
2020-01-10 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.27.4 release
Modified: trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.cpp (254341 => 254342)
--- trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.cpp 2020-01-10 16:48:40 UTC (rev 254341)
+++ trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.cpp 2020-01-10 17:40:35 UTC (rev 254342)
@@ -90,6 +90,16 @@
WebKit::toImpl(configuration)->setWebSQLDatabaseDirectory(WebKit::toImpl(directory)->string());
}
+WKStringRef WKWebsiteDataStoreConfigurationCopyCacheStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration)
+{
+ return WebKit::toCopiedAPI(WebKit::toImpl(configuration)->cacheStorageDirectory());
+}
+
+void WKWebsiteDataStoreConfigurationSetCacheStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration, WKStringRef directory)
+{
+ WebKit::toImpl(configuration)->setCacheStorageDirectory(WebKit::toImpl(directory)->string());
+}
+
WKStringRef WKWebsiteDataStoreConfigurationCopyMediaKeysStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration)
{
return WebKit::toCopiedAPI(WebKit::toImpl(configuration)->mediaKeysStorageDirectory());
Modified: trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.h (254341 => 254342)
--- trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.h 2020-01-10 16:48:40 UTC (rev 254341)
+++ trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.h 2020-01-10 17:40:35 UTC (rev 254342)
@@ -51,6 +51,9 @@
WK_EXPORT WKStringRef WKWebsiteDataStoreConfigurationCopyWebSQLDatabaseDirectory(WKWebsiteDataStoreConfigurationRef configuration);
WK_EXPORT void WKWebsiteDataStoreConfigurationSetWebSQLDatabaseDirectory(WKWebsiteDataStoreConfigurationRef configuration, WKStringRef directory);
+WK_EXPORT WKStringRef WKWebsiteDataStoreConfigurationCopyCacheStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration);
+WK_EXPORT void WKWebsiteDataStoreConfigurationSetCacheStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration, WKStringRef directory);
+
WK_EXPORT WKStringRef WKWebsiteDataStoreConfigurationCopyMediaKeysStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration);
WK_EXPORT void WKWebsiteDataStoreConfigurationSetMediaKeysStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration, WKStringRef directory);
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (254341 => 254342)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2020-01-10 16:48:40 UTC (rev 254341)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2020-01-10 17:40:35 UTC (rev 254342)
@@ -319,16 +319,6 @@
{
}
-- (NSString *)_cacheStorageDirectory
-{
- return _websiteDataStore->cacheStorageDirectory();
-}
-
-- (void)_setCacheStorageDirectory:(NSString *)directory
-{
- _websiteDataStore->setCacheStorageDirectory(directory);
-}
-
- (void)_setBoundInterfaceIdentifier:(NSString *)identifier
{
_websiteDataStore->setBoundInterfaceIdentifier(identifier);
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h (254341 => 254342)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h 2020-01-10 16:48:40 UTC (rev 254341)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h 2020-01-10 17:40:35 UTC (rev 254342)
@@ -50,7 +50,6 @@
@property (nonatomic, setter=_setResourceLoadStatisticsEnabled:) BOOL _resourceLoadStatisticsEnabled WK_API_AVAILABLE(macos(10.12), ios(10.0));
@property (nonatomic, setter=_setResourceLoadStatisticsDebugMode:) BOOL _resourceLoadStatisticsDebugMode WK_API_AVAILABLE(macos(10.14), ios(12.0));
@property (nonatomic, setter=_setPerOriginStorageQuota:) NSUInteger _perOriginStorageQuota WK_API_DEPRECATED_WITH_REPLACEMENT("_WKWebsiteDataStoreConfiguration.perOriginStorageQuota", macos(10.13.4, WK_MAC_TBA), ios(11.3, WK_IOS_TBA));
-@property (nonatomic, setter=_setCacheStorageDirectory:) NSString* _cacheStorageDirectory WK_API_DEPRECATED_WITH_REPLACEMENT("_WKWebsiteDataStoreConfiguration.cacheStorageDirectory", macos(10.13.4, WK_MAC_TBA), ios(11.3, WK_IOS_TBA));
@property (nonatomic, setter=_setBoundInterfaceIdentifier:) NSString *_boundInterfaceIdentifier WK_API_DEPRECATED_WITH_REPLACEMENT("_WKWebsiteDataStoreConfiguration.boundInterfaceIdentifier", macos(10.13.4, WK_MAC_TBA), ios(11.3, WK_IOS_TBA));
@property (nonatomic, setter=_setAllowsCellularAccess:) BOOL _allowsCellularAccess WK_API_DEPRECATED_WITH_REPLACEMENT("_WKWebsiteDataStoreConfiguration.allowsCellularAccess", macos(10.13.4, WK_MAC_TBA), ios(11.3, WK_IOS_TBA));
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp (254341 => 254342)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2020-01-10 16:48:40 UTC (rev 254341)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2020-01-10 17:40:35 UTC (rev 254342)
@@ -1202,7 +1202,7 @@
return;
}
- auto& cacheStorageDirectory = store->cacheStorageDirectory();
+ auto& cacheStorageDirectory = store->configuration().cacheStorageDirectory();
SandboxExtension::Handle cacheStorageDirectoryExtensionHandle;
if (!cacheStorageDirectory.isEmpty())
SandboxExtension::createHandleForReadWriteDirectory(cacheStorageDirectory, cacheStorageDirectoryExtensionHandle);
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (254341 => 254342)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2020-01-10 16:48:40 UTC (rev 254341)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2020-01-10 17:40:35 UTC (rev 254342)
@@ -126,7 +126,6 @@
uint64_t perOriginStorageQuota() const { return m_resolvedConfiguration->perOriginStorageQuota(); }
uint64_t perThirdPartyOriginStorageQuota() const;
const String& cacheStorageDirectory() const { return m_resolvedConfiguration->cacheStorageDirectory(); }
- void setCacheStorageDirectory(String&& directory) { m_resolvedConfiguration->setCacheStorageDirectory(WTFMove(directory)); }
#if ENABLE(RESOURCE_LOAD_STATISTICS)
void clearResourceLoadStatisticsInWebProcesses(CompletionHandler<void()>&&);
Modified: trunk/Tools/ChangeLog (254341 => 254342)
--- trunk/Tools/ChangeLog 2020-01-10 16:48:40 UTC (rev 254341)
+++ trunk/Tools/ChangeLog 2020-01-10 17:40:35 UTC (rev 254342)
@@ -1,3 +1,16 @@
+2020-01-10 Alex Christensen <[email protected]>
+
+ Remove WebsiteDataStore::setCacheStorageDirectory which has been replaced by WebsiteDataStoreConfiguration::setCacheStorageDirectory
+ https://bugs.webkit.org/show_bug.cgi?id=205841
+
+ Reviewed by Youenn Fablet.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm:
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::websiteDataStore):
+ * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+ (WTR::initializeWebViewConfiguration):
+
2020-01-10 youenn fablet <[email protected]>
[WTR] Use short heart beat timer as a TestOption
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm (254341 => 254342)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm 2020-01-10 16:48:40 UTC (rev 254341)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm 2020-01-10 17:40:35 UTC (rev 254342)
@@ -1357,8 +1357,8 @@
setConfigurationInjectedBundlePath(configuration.get());
auto dataStoreConfiguration = adoptNS([_WKWebsiteDataStoreConfiguration new]);
[dataStoreConfiguration _setServiceWorkerRegistrationDirectory:[NSURL fileURLWithPath:@"/var/tmp"]];
+ [dataStoreConfiguration _setCacheStorageDirectory:[NSURL fileURLWithPath:@"/var/tmp"]];
auto websiteDataStore = adoptNS([[WKWebsiteDataStore alloc] _initWithConfiguration:dataStoreConfiguration.get()]);
- [websiteDataStore _setCacheStorageDirectory:@"/var/tmp"];
[configuration setWebsiteDataStore:websiteDataStore.get()];
RetainPtr<DirectoryPageMessageHandler> directoryPageMessageHandler = adoptNS([[DirectoryPageMessageHandler alloc] init]);
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (254341 => 254342)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2020-01-10 16:48:40 UTC (rev 254341)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2020-01-10 17:40:35 UTC (rev 254342)
@@ -529,6 +529,7 @@
WKWebsiteDataStoreConfigurationSetApplicationCacheDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "ApplicationCache").get());
WKWebsiteDataStoreConfigurationSetNetworkCacheDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "Cache").get());
+ WKWebsiteDataStoreConfigurationSetCacheStorageDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "CacheStorage").get());
WKWebsiteDataStoreConfigurationSetIndexedDBDatabaseDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "Databases" + pathSeparator + "IndexedDB").get());
WKWebsiteDataStoreConfigurationSetLocalStorageDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "LocalStorage").get());
WKWebsiteDataStoreConfigurationSetWebSQLDatabaseDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "Databases" + pathSeparator + "WebSQL").get());
Modified: trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm (254341 => 254342)
--- trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2020-01-10 16:48:40 UTC (rev 254341)
+++ trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2020-01-10 17:40:35 UTC (rev 254342)
@@ -71,12 +71,6 @@
WKContextSetStorageAccessAPIEnabled(context, true);
- WKWebsiteDataStore* poolWebsiteDataStore = (__bridge WKWebsiteDataStore *)TestController::websiteDataStore();
- if (libraryPath) {
- String cacheStorageDirectory = String(libraryPath) + '/' + "CacheStorage";
- [poolWebsiteDataStore _setCacheStorageDirectory: cacheStorageDirectory];
- }
-
[globalWebViewConfiguration.websiteDataStore _setResourceLoadStatisticsEnabled:YES];
[globalWebsiteDataStoreDelegateClient release];
