Changeset 228442 in webkit

Timestamp:

Feb 13, 2018 4:08:39 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Add support for configuring WebsiteDatastore service worker and cache storage path
​https://bugs.webkit.org/show_bug.cgi?id=182674

Patch by Youenn Fablet <​youenn@apple.com> on 2018-02-13
Reviewed by Chris Dumez.

Beef up WKWebsiteDataStoreConfiguration to easily set the WebsiteDataStore
service worker registration and cache storage directory path.

• UIProcess/API/Cocoa/WKWebsiteDataStore.mm:

(-[WKWebsiteDataStore _initWithConfiguration:]):

• UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h:
• UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm:

(-[_WKWebsiteDataStoreConfiguration _cacheStorageDirectory]):
(-[_WKWebsiteDataStoreConfiguration _setCacheStorageDirectory:]):
(-[_WKWebsiteDataStoreConfiguration _serviceWorkerRegistrationDirectory]):
(-[_WKWebsiteDataStoreConfiguration _setServiceWorkerRegistrationDirectory:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebsiteDataStore.mm (modified) (1 diff)
• UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h (modified) (1 diff)
• UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-02-13  Youenn Fablet  <youenn@apple.com>
+
+        Add support for configuring WebsiteDatastore service worker and cache storage path
+        https://bugs.webkit.org/show_bug.cgi?id=182674
+
+        Reviewed by Chris Dumez.
+
+        Beef up WKWebsiteDataStoreConfiguration to easily set the WebsiteDataStore
+        service worker registration and cache storage directory path.
+
+        * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+        (-[WKWebsiteDataStore _initWithConfiguration:]):
+        * UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h:
+        * UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm:
+        (-[_WKWebsiteDataStoreConfiguration _cacheStorageDirectory]):
+        (-[_WKWebsiteDataStoreConfiguration _setCacheStorageDirectory:]):
+        (-[_WKWebsiteDataStoreConfiguration _serviceWorkerRegistrationDirectory]):
+        (-[_WKWebsiteDataStoreConfiguration _setServiceWorkerRegistrationDirectory:]):
+
 2018-02-13  Brian Burg  <bburg@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm

@@ -201 +201 @@
     if (configuration._resourceLoadStatisticsDirectory)
         config.resourceLoadStatisticsDirectory = configuration._resourceLoadStatisticsDirectory.path;
+    if (configuration._cacheStorageDirectory)
+        config.cacheStorageDirectory = configuration._cacheStorageDirectory.path;
+    if (configuration._serviceWorkerRegistrationDirectory)
+        config.serviceWorkerRegistrationDirectory = configuration._serviceWorkerRegistrationDirectory.path;
 
     API::Object::constructInWrapper<API::WebsiteDataStore>(self, config, PAL::SessionID::generatePersistentSessionID());

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h

@@ -40 +40 @@
 @property (nonatomic, copy, setter=_setCookieStorageFile:) NSURL *_cookieStorageFile;
 @property (nonatomic, copy, setter=_setResourceLoadStatisticsDirectory:) NSURL *_resourceLoadStatisticsDirectory WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+@property (nonatomic, copy, setter=_setCacheStorageDirectory:) NSURL *_cacheStorageDirectory WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+@property (nonatomic, copy, setter=_setServiceWorkerRegistrationDirectory:) NSURL *_serviceWorkerRegistrationDirectory WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 
 @end

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm

@@ -43 +43 @@
     RetainPtr<NSURL> _cookieStorageFileURL;
     RetainPtr<NSURL> _resourceLoadStatisticsDirectoryURL;
+    RetainPtr<NSURL> _cacheStorageDirectoryURL;
+    RetainPtr<NSURL> _serviceWorkerRegistrationDirectoryURL;
 }
 
@@ -103 +105 @@
 }
 
+- (NSURL *)_cacheStorageDirectory
+{
+    return _cacheStorageDirectoryURL.get();
+}
+
+- (void)_setCacheStorageDirectory:(NSURL *)url
+{
+    checkURLArgument(url);
+    _cacheStorageDirectoryURL = adoptNS([url copy]);
+}
+
+- (NSURL *)_serviceWorkerRegistrationDirectory
+{
+    return _serviceWorkerRegistrationDirectoryURL.get();
+}
+
+- (void)_setServiceWorkerRegistrationDirectory:(NSURL *)url
+{
+    checkURLArgument(url);
+    _serviceWorkerRegistrationDirectoryURL = adoptNS([url copy]);
+}
+
 @end