Changeset 254342 in webkit
- Timestamp:
- Jan 10, 2020 9:40:35 AM (4 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r254333 r254342 1 2020-01-10 Alex Christensen <achristensen@webkit.org> 2 3 Remove WebsiteDataStore::setCacheStorageDirectory which has been replaced by WebsiteDataStoreConfiguration::setCacheStorageDirectory 4 https://bugs.webkit.org/show_bug.cgi?id=205841 5 6 Reviewed by Youenn Fablet. 7 8 * UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.cpp: 9 (WKWebsiteDataStoreConfigurationCopyCacheStorageDirectory): 10 (WKWebsiteDataStoreConfigurationSetCacheStorageDirectory): 11 * UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.h: 12 * UIProcess/API/Cocoa/WKWebsiteDataStore.mm: 13 (-[WKWebsiteDataStore _cacheStorageDirectory]): Deleted. 14 (-[WKWebsiteDataStore _setCacheStorageDirectory:]): Deleted. 15 * UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h: 16 * UIProcess/Network/NetworkProcessProxy.cpp: 17 (WebKit::NetworkProcessProxy::retrieveCacheStorageParameters): 18 * UIProcess/WebsiteData/WebsiteDataStore.h: 19 (WebKit::WebsiteDataStore::cacheStorageDirectory const): 20 (WebKit::WebsiteDataStore::setCacheStorageDirectory): Deleted. 21 1 22 2020-01-10 Carlos Garcia Campos <cgarcia@igalia.com> 2 23 -
trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.cpp
r254085 r254342 91 91 } 92 92 93 WKStringRef WKWebsiteDataStoreConfigurationCopyCacheStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration) 94 { 95 return WebKit::toCopiedAPI(WebKit::toImpl(configuration)->cacheStorageDirectory()); 96 } 97 98 void WKWebsiteDataStoreConfigurationSetCacheStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration, WKStringRef directory) 99 { 100 WebKit::toImpl(configuration)->setCacheStorageDirectory(WebKit::toImpl(directory)->string()); 101 } 102 93 103 WKStringRef WKWebsiteDataStoreConfigurationCopyMediaKeysStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration) 94 104 { -
trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.h
r254085 r254342 52 52 WK_EXPORT void WKWebsiteDataStoreConfigurationSetWebSQLDatabaseDirectory(WKWebsiteDataStoreConfigurationRef configuration, WKStringRef directory); 53 53 54 WK_EXPORT WKStringRef WKWebsiteDataStoreConfigurationCopyCacheStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration); 55 WK_EXPORT void WKWebsiteDataStoreConfigurationSetCacheStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration, WKStringRef directory); 56 54 57 WK_EXPORT WKStringRef WKWebsiteDataStoreConfigurationCopyMediaKeysStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration); 55 58 WK_EXPORT void WKWebsiteDataStoreConfigurationSetMediaKeysStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration, WKStringRef directory); -
trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
r254296 r254342 320 320 } 321 321 322 - (NSString *)_cacheStorageDirectory323 {324 return _websiteDataStore->cacheStorageDirectory();325 }326 327 - (void)_setCacheStorageDirectory:(NSString *)directory328 {329 _websiteDataStore->setCacheStorageDirectory(directory);330 }331 332 322 - (void)_setBoundInterfaceIdentifier:(NSString *)identifier 333 323 { -
trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h
r254296 r254342 51 51 @property (nonatomic, setter=_setResourceLoadStatisticsDebugMode:) BOOL _resourceLoadStatisticsDebugMode WK_API_AVAILABLE(macos(10.14), ios(12.0)); 52 52 @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)); 53 @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));54 53 55 54 @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)); -
trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
r254183 r254342 1203 1203 } 1204 1204 1205 auto& cacheStorageDirectory = store->c acheStorageDirectory();1205 auto& cacheStorageDirectory = store->configuration().cacheStorageDirectory(); 1206 1206 SandboxExtension::Handle cacheStorageDirectoryExtensionHandle; 1207 1207 if (!cacheStorageDirectory.isEmpty()) -
trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
r254296 r254342 127 127 uint64_t perThirdPartyOriginStorageQuota() const; 128 128 const String& cacheStorageDirectory() const { return m_resolvedConfiguration->cacheStorageDirectory(); } 129 void setCacheStorageDirectory(String&& directory) { m_resolvedConfiguration->setCacheStorageDirectory(WTFMove(directory)); }130 129 131 130 #if ENABLE(RESOURCE_LOAD_STATISTICS) -
trunk/Tools/ChangeLog
r254341 r254342 1 2020-01-10 Alex Christensen <achristensen@webkit.org> 2 3 Remove WebsiteDataStore::setCacheStorageDirectory which has been replaced by WebsiteDataStoreConfiguration::setCacheStorageDirectory 4 https://bugs.webkit.org/show_bug.cgi?id=205841 5 6 Reviewed by Youenn Fablet. 7 8 * TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm: 9 * WebKitTestRunner/TestController.cpp: 10 (WTR::TestController::websiteDataStore): 11 * WebKitTestRunner/cocoa/TestControllerCocoa.mm: 12 (WTR::initializeWebViewConfiguration): 13 1 14 2020-01-10 youenn fablet <youenn@apple.com> 2 15 -
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm
r254085 r254342 1358 1358 auto dataStoreConfiguration = adoptNS([_WKWebsiteDataStoreConfiguration new]); 1359 1359 [dataStoreConfiguration _setServiceWorkerRegistrationDirectory:[NSURL fileURLWithPath:@"/var/tmp"]]; 1360 [dataStoreConfiguration _setCacheStorageDirectory:[NSURL fileURLWithPath:@"/var/tmp"]]; 1360 1361 auto websiteDataStore = adoptNS([[WKWebsiteDataStore alloc] _initWithConfiguration:dataStoreConfiguration.get()]); 1361 [websiteDataStore _setCacheStorageDirectory:@"/var/tmp"];1362 1362 [configuration setWebsiteDataStore:websiteDataStore.get()]; 1363 1363 -
trunk/Tools/WebKitTestRunner/TestController.cpp
r254341 r254342 530 530 WKWebsiteDataStoreConfigurationSetApplicationCacheDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "ApplicationCache").get()); 531 531 WKWebsiteDataStoreConfigurationSetNetworkCacheDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "Cache").get()); 532 WKWebsiteDataStoreConfigurationSetCacheStorageDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "CacheStorage").get()); 532 533 WKWebsiteDataStoreConfigurationSetIndexedDBDatabaseDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "Databases" + pathSeparator + "IndexedDB").get()); 533 534 WKWebsiteDataStoreConfigurationSetLocalStorageDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "LocalStorage").get()); -
trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
r254296 r254342 72 72 WKContextSetStorageAccessAPIEnabled(context, true); 73 73 74 WKWebsiteDataStore* poolWebsiteDataStore = (__bridge WKWebsiteDataStore *)TestController::websiteDataStore();75 if (libraryPath) {76 String cacheStorageDirectory = String(libraryPath) + '/' + "CacheStorage";77 [poolWebsiteDataStore _setCacheStorageDirectory: cacheStorageDirectory];78 }79 80 74 [globalWebViewConfiguration.websiteDataStore _setResourceLoadStatisticsEnabled:YES]; 81 75
Note: See TracChangeset
for help on using the changeset viewer.