Changeset 254342 in webkit


Ignore:
Timestamp:
Jan 10, 2020 9:40:35 AM (4 years ago)
Author:
commit-queue@webkit.org
Message:

Remove WebsiteDataStore::setCacheStorageDirectory which has been replaced by WebsiteDataStoreConfiguration::setCacheStorageDirectory
https://bugs.webkit.org/show_bug.cgi?id=205841

Patch by Alex Christensen <achristensen@webkit.org> on 2020-01-10
Reviewed by Youenn Fablet.

Source/WebKit:

  • 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.

Tools:

  • TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm:
  • WebKitTestRunner/TestController.cpp:

(WTR::TestController::websiteDataStore):

  • WebKitTestRunner/cocoa/TestControllerCocoa.mm:

(WTR::initializeWebViewConfiguration):

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/ChangeLog

    r254333 r254342  
     12020-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
    1222020-01-10  Carlos Garcia Campos  <cgarcia@igalia.com>
    223
  • trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.cpp

    r254085 r254342  
    9191}
    9292
     93WKStringRef WKWebsiteDataStoreConfigurationCopyCacheStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration)
     94{
     95    return WebKit::toCopiedAPI(WebKit::toImpl(configuration)->cacheStorageDirectory());
     96}
     97
     98void WKWebsiteDataStoreConfigurationSetCacheStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration, WKStringRef directory)
     99{
     100    WebKit::toImpl(configuration)->setCacheStorageDirectory(WebKit::toImpl(directory)->string());
     101}
     102
    93103WKStringRef WKWebsiteDataStoreConfigurationCopyMediaKeysStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration)
    94104{
  • trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.h

    r254085 r254342  
    5252WK_EXPORT void WKWebsiteDataStoreConfigurationSetWebSQLDatabaseDirectory(WKWebsiteDataStoreConfigurationRef configuration, WKStringRef directory);
    5353
     54WK_EXPORT WKStringRef WKWebsiteDataStoreConfigurationCopyCacheStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration);
     55WK_EXPORT void WKWebsiteDataStoreConfigurationSetCacheStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration, WKStringRef directory);
     56
    5457WK_EXPORT WKStringRef WKWebsiteDataStoreConfigurationCopyMediaKeysStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration);
    5558WK_EXPORT void WKWebsiteDataStoreConfigurationSetMediaKeysStorageDirectory(WKWebsiteDataStoreConfigurationRef configuration, WKStringRef directory);
  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm

    r254296 r254342  
    320320}
    321321
    322 - (NSString *)_cacheStorageDirectory
    323 {
    324     return _websiteDataStore->cacheStorageDirectory();
    325 }
    326 
    327 - (void)_setCacheStorageDirectory:(NSString *)directory
    328 {
    329     _websiteDataStore->setCacheStorageDirectory(directory);
    330 }
    331 
    332322- (void)_setBoundInterfaceIdentifier:(NSString *)identifier
    333323{
  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h

    r254296 r254342  
    5151@property (nonatomic, setter=_setResourceLoadStatisticsDebugMode:) BOOL _resourceLoadStatisticsDebugMode WK_API_AVAILABLE(macos(10.14), ios(12.0));
    5252@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));
    5453
    5554@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  
    12031203    }
    12041204
    1205     auto& cacheStorageDirectory = store->cacheStorageDirectory();
     1205    auto& cacheStorageDirectory = store->configuration().cacheStorageDirectory();
    12061206    SandboxExtension::Handle cacheStorageDirectoryExtensionHandle;
    12071207    if (!cacheStorageDirectory.isEmpty())
  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h

    r254296 r254342  
    127127    uint64_t perThirdPartyOriginStorageQuota() const;
    128128    const String& cacheStorageDirectory() const { return m_resolvedConfiguration->cacheStorageDirectory(); }
    129     void setCacheStorageDirectory(String&& directory) { m_resolvedConfiguration->setCacheStorageDirectory(WTFMove(directory)); }
    130129
    131130#if ENABLE(RESOURCE_LOAD_STATISTICS)
  • trunk/Tools/ChangeLog

    r254341 r254342  
     12020-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
    1142020-01-10  youenn fablet  <youenn@apple.com>
    215
  • trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm

    r254085 r254342  
    13581358    auto dataStoreConfiguration = adoptNS([_WKWebsiteDataStoreConfiguration new]);
    13591359    [dataStoreConfiguration _setServiceWorkerRegistrationDirectory:[NSURL fileURLWithPath:@"/var/tmp"]];
     1360    [dataStoreConfiguration _setCacheStorageDirectory:[NSURL fileURLWithPath:@"/var/tmp"]];
    13601361    auto websiteDataStore = adoptNS([[WKWebsiteDataStore alloc] _initWithConfiguration:dataStoreConfiguration.get()]);
    1361     [websiteDataStore _setCacheStorageDirectory:@"/var/tmp"];
    13621362    [configuration setWebsiteDataStore:websiteDataStore.get()];
    13631363
  • trunk/Tools/WebKitTestRunner/TestController.cpp

    r254341 r254342  
    530530            WKWebsiteDataStoreConfigurationSetApplicationCacheDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "ApplicationCache").get());
    531531            WKWebsiteDataStoreConfigurationSetNetworkCacheDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "Cache").get());
     532            WKWebsiteDataStoreConfigurationSetCacheStorageDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "CacheStorage").get());
    532533            WKWebsiteDataStoreConfigurationSetIndexedDBDatabaseDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "Databases" + pathSeparator + "IndexedDB").get());
    533534            WKWebsiteDataStoreConfigurationSetLocalStorageDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "LocalStorage").get());
  • trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm

    r254296 r254342  
    7272    WKContextSetStorageAccessAPIEnabled(context, true);
    7373
    74     WKWebsiteDataStore* poolWebsiteDataStore = (__bridge WKWebsiteDataStore *)TestController::websiteDataStore();
    75     if (libraryPath) {
    76         String cacheStorageDirectory = String(libraryPath) + '/' + "CacheStorage";
    77         [poolWebsiteDataStore _setCacheStorageDirectory: cacheStorageDirectory];
    78     }
    79 
    8074    [globalWebViewConfiguration.websiteDataStore _setResourceLoadStatisticsEnabled:YES];
    8175
Note: See TracChangeset for help on using the changeset viewer.