⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 243911 in webkit


Ignore:
Timestamp:
Apr 4, 2019, 3:07:09 PM (7 years ago)
Author:
youenn@apple.com
Message:

Pass storage quota parameters from UIProcess to NetworkProcess as part of WebsiteDataStore parameters
​https://bugs.webkit.org/show_bug.cgi?id=196543

Reviewed by Alex Christensen.

Source/WebCore:

Add a default routine to compute a third party quota from a per origin quota.
No change of behavior.

  • storage/StorageQuotaManager.h:

(WebCore::StorageQuotaManager::defaultThirdPartyQuotaFromPerOriginQuota):
(WebCore::StorageQuotaManager::defaultThirdPartyQuota):

Source/WebKit:

Renamed methods used to set cache storage quota to be storage generic
since they will apply to all storage.

Pass quota parameters as part of WebsiteDataStoreParameters from UIProcess
to NetworkProcess (start-up time and new WebsiteDataStore time).

Compute on UIProcess the quota for third party origins using the default rule of dividing by 10.

  • NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::initializeNetworkProcess):
(WebKit::NetworkProcess::addWebsiteDataStore):
(WebKit::NetworkProcess::initializeStorageQuota):
(WebKit::NetworkProcess::setCacheStorageParameters):

  • NetworkProcess/NetworkProcess.h:
  • NetworkProcess/NetworkProcess.messages.in:
  • Shared/WebsiteDataStoreParameters.cpp:

(WebKit::WebsiteDataStoreParameters::encode const):
(WebKit::WebsiteDataStoreParameters::decode):

  • Shared/WebsiteDataStoreParameters.h:
  • UIProcess/API/C/WKWebsiteDataStoreRef.cpp:

(WKWebsiteDataStoreSetPerOriginStorageQuota):
(WKWebsiteDataStoreSetCacheStoragePerOriginQuota): Deleted.

  • UIProcess/API/C/WKWebsiteDataStoreRef.h:
  • UIProcess/API/Cocoa/WKWebsiteDataStore.mm:

(-[WKWebsiteDataStore _perOriginStorageQuota]):
(-[WKWebsiteDataStore _setPerOriginStorageQuota:]):
(-[WKWebsiteDataStore _cacheStoragePerOriginQuota]): Deleted.
(-[WKWebsiteDataStore _setCacheStoragePerOriginQuota:]): Deleted.

  • UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h:
  • UIProcess/Network/NetworkProcessProxy.cpp:

(WebKit::NetworkProcessProxy::retrieveCacheStorageParameters):

  • UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::parameters):

  • UIProcess/WebsiteData/WebsiteDataStore.h:

(WebKit::WebsiteDataStore::perOriginStorageQuota const):
(WebKit::WebsiteDataStore::setPerOriginStorageQuota):
(WebKit::WebsiteDataStore::cacheStoragePerOriginQuota const): Deleted.
(WebKit::WebsiteDataStore::setCacheStoragePerOriginQuota): Deleted.

  • UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp:

(WebKit::WebsiteDataStoreConfiguration::copy):

  • UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h:

(WebKit::WebsiteDataStoreConfiguration::perOriginStorageQuota):
(WebKit::WebsiteDataStoreConfiguration::setPerOriginStorageQuota):
(WebKit::WebsiteDataStoreConfiguration::cacheStoragePerOriginQuota): Deleted.
(WebKit::WebsiteDataStoreConfiguration::setCacheStoragePerOriginQuota): Deleted.

Tools:

  • WebKitTestRunner/TestController.cpp:

(WTR::TestController::generatePageConfiguration):

Location:
trunk
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r243910 r243911  
     12019-04-04  Youenn Fablet  <youenn@apple.com>
     2
     3        Pass storage quota parameters from UIProcess to NetworkProcess as part of WebsiteDataStore parameters
     4        https://bugs.webkit.org/show_bug.cgi?id=196543
     5
     6        Reviewed by Alex Christensen.
     7
     8        Add a default routine to compute a third party quota from a per origin quota.
     9        No change of behavior.
     10
     11        * storage/StorageQuotaManager.h:
     12        (WebCore::StorageQuotaManager::defaultThirdPartyQuotaFromPerOriginQuota):
     13        (WebCore::StorageQuotaManager::defaultThirdPartyQuota):
     14
    1152019-04-04  Commit Queue  <commit-queue@webkit.org>
    216

  • trunk/Source/WebCore/storage/StorageQuotaManager.h

    r243339 r243911  
    4747    WEBCORE_EXPORT ~StorageQuotaManager();
    4848
     49    static constexpr uint64_t defaultThirdPartyQuotaFromPerOriginQuota(uint64_t quota) { return quota / 10; }
     50
    4951    static constexpr uint64_t defaultQuota() { return 1000 * MB; }
    50     static constexpr uint64_t defaultThirdPartyQuota() { return 100 * MB; }
     52    static constexpr uint64_t defaultThirdPartyQuota() { return defaultThirdPartyQuotaFromPerOriginQuota(defaultQuota()); }
    5153
    5254    WEBCORE_EXPORT void addUser(StorageQuotaUser&);

  • trunk/Source/WebKit/ChangeLog

    r243909 r243911  
     12019-04-04  Youenn Fablet  <youenn@apple.com>
     2
     3        Pass storage quota parameters from UIProcess to NetworkProcess as part of WebsiteDataStore parameters
     4        https://bugs.webkit.org/show_bug.cgi?id=196543
     5
     6        Reviewed by Alex Christensen.
     7
     8        Renamed methods used to set cache storage quota to be storage generic
     9        since they will apply to all storage.
     10
     11        Pass quota parameters as part of WebsiteDataStoreParameters from UIProcess
     12        to NetworkProcess (start-up time and new WebsiteDataStore time).
     13
     14        Compute on UIProcess the quota for third party origins using the default rule of dividing by 10.
     15
     16        * NetworkProcess/NetworkProcess.cpp:
     17        (WebKit::NetworkProcess::initializeNetworkProcess):
     18        (WebKit::NetworkProcess::addWebsiteDataStore):
     19        (WebKit::NetworkProcess::initializeStorageQuota):
     20        (WebKit::NetworkProcess::setCacheStorageParameters):
     21        * NetworkProcess/NetworkProcess.h:
     22        * NetworkProcess/NetworkProcess.messages.in:
     23        * Shared/WebsiteDataStoreParameters.cpp:
     24        (WebKit::WebsiteDataStoreParameters::encode const):
     25        (WebKit::WebsiteDataStoreParameters::decode):
     26        * Shared/WebsiteDataStoreParameters.h:
     27        * UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
     28        (WKWebsiteDataStoreSetPerOriginStorageQuota):
     29        (WKWebsiteDataStoreSetCacheStoragePerOriginQuota): Deleted.
     30        * UIProcess/API/C/WKWebsiteDataStoreRef.h:
     31        * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
     32        (-[WKWebsiteDataStore _perOriginStorageQuota]):
     33        (-[WKWebsiteDataStore _setPerOriginStorageQuota:]):
     34        (-[WKWebsiteDataStore _cacheStoragePerOriginQuota]): Deleted.
     35        (-[WKWebsiteDataStore _setCacheStoragePerOriginQuota:]): Deleted.
     36        * UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h:
     37        * UIProcess/Network/NetworkProcessProxy.cpp:
     38        (WebKit::NetworkProcessProxy::retrieveCacheStorageParameters):
     39        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
     40        (WebKit::WebsiteDataStore::parameters):
     41        * UIProcess/WebsiteData/WebsiteDataStore.h:
     42        (WebKit::WebsiteDataStore::perOriginStorageQuota const):
     43        (WebKit::WebsiteDataStore::setPerOriginStorageQuota):
     44        (WebKit::WebsiteDataStore::cacheStoragePerOriginQuota const): Deleted.
     45        (WebKit::WebsiteDataStore::setCacheStoragePerOriginQuota): Deleted.
     46        * UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp:
     47        (WebKit::WebsiteDataStoreConfiguration::copy):
     48        * UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h:
     49        (WebKit::WebsiteDataStoreConfiguration::perOriginStorageQuota):
     50        (WebKit::WebsiteDataStoreConfiguration::setPerOriginStorageQuota):
     51        (WebKit::WebsiteDataStoreConfiguration::cacheStoragePerOriginQuota): Deleted.
     52        (WebKit::WebsiteDataStoreConfiguration::setCacheStoragePerOriginQuota): Deleted.
     53
    1542019-04-04  Wenson Hsieh  <wenson_hsieh@apple.com>
    255

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

    r243806 r243911  
    323323    }
    324324#endif
     325    initializeStorageQuota(parameters.defaultDataStoreParameters);
    325326
    326327    auto* defaultSession = networkSession(PAL::SessionID::defaultSessionID());
    … …  
    456457#endif
    457458
     459    initializeStorageQuota(parameters);
     460
    458461    RemoteNetworkingContext::ensureWebsiteDataStoreSession(*this, WTFMove(parameters));
     462}
     463
     464void NetworkProcess::initializeStorageQuota(const WebsiteDataStoreParameters& parameters)
     465{
     466    auto& managers =  m_storageQuotaManagers.ensure(parameters.networkSessionParameters.sessionID, [] {
     467        return StorageQuotaManagers { };
     468    }).iterator->value;
     469    managers.setDefaultQuotas(parameters.perOriginStorageQuota, parameters.perThirdPartyOriginStorageQuota);
    459470}
    460471
    … …  
    20302041}
    20312042
    2032 void NetworkProcess::setCacheStorageParameters(PAL::SessionID sessionID, uint64_t quota, String&& cacheStorageDirectory, SandboxExtension::Handle&& handle)
    2033 {
    2034     auto& managers =  m_storageQuotaManagers.ensure(sessionID, [] {
    2035         return StorageQuotaManagers { };
    2036     }).iterator->value;
    2037     managers.setDefaultQuotas(quota, quota / 10);
    2038 
     2043void NetworkProcess::setCacheStorageParameters(PAL::SessionID sessionID, String&& cacheStorageDirectory, SandboxExtension::Handle&& handle)
     2044{
    20392045    auto iterator = m_cacheStorageParametersCallbacks.find(sessionID);
    20402046    if (iterator == m_cacheStorageParametersCallbacks.end())

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

    r243806 r243911  
    381381    void clearCachedCredentials();
    382382
    383     void setCacheStorageParameters(PAL::SessionID, uint64_t quota, String&& cacheStorageDirectory, SandboxExtension::Handle&&);
     383    void setCacheStorageParameters(PAL::SessionID, String&& cacheStorageDirectory, SandboxExtension::Handle&&);
    384384    void initializeQuotaUsers(WebCore::StorageQuotaManager&, PAL::SessionID, const WebCore::ClientOrigin&);
    385385
    … …  
    461461
    462462    void clearStorageQuota(PAL::SessionID);
     463    void initializeStorageQuota(const WebsiteDataStoreParameters&);
    463464
    464465    // Connections to WebProcesses.

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in

    r243345 r243911  
    152152    RegisterURLSchemeAsCanDisplayOnlyIfCanRequest(String scheme)
    153153
    154     SetCacheStorageParameters(PAL::SessionID sessionID, uint64_t quota, String cacheStorageDirectory, WebKit::SandboxExtension::Handle handle);
     154    SetCacheStorageParameters(PAL::SessionID sessionID, String cacheStorageDirectory, WebKit::SandboxExtension::Handle handle);
    155155
    156156#if ENABLE(SERVICE_WORKER)

  • trunk/Source/WebKit/Shared/WebsiteDataStoreParameters.cpp

    r243163 r243911  
    5353    encoder << serviceWorkerRegistrationDirectory << serviceWorkerRegistrationDirectoryExtensionHandle;
    5454#endif
     55
     56    encoder << perOriginStorageQuota;
     57    encoder << perThirdPartyOriginStorageQuota;
    5558}
    5659
    … …  
    118121    parameters.serviceWorkerRegistrationDirectoryExtensionHandle = WTFMove(*serviceWorkerRegistrationDirectoryExtensionHandle);
    119122#endif
     123
     124    Optional<uint64_t> perOriginStorageQuota;
     125    decoder >> perOriginStorageQuota;
     126    if (!perOriginStorageQuota)
     127        return WTF::nullopt;
     128    parameters.perOriginStorageQuota = *perOriginStorageQuota;
     129
     130    Optional<uint64_t> perThirdPartyOriginStorageQuota;
     131    decoder >> perThirdPartyOriginStorageQuota;
     132    if (!perThirdPartyOriginStorageQuota)
     133        return WTF::nullopt;
     134    parameters.perThirdPartyOriginStorageQuota = *perThirdPartyOriginStorageQuota;
    120135   
    121136    return parameters;

  • trunk/Source/WebKit/Shared/WebsiteDataStoreParameters.h

    r239632 r243911  
    2929#include "SandboxExtension.h"
    3030#include <WebCore/Cookie.h>
     31#include <WebCore/StorageQuotaManager.h>
    3132#include <pal/SessionID.h>
    3233#include <wtf/Vector.h>
    … …  
    6970    SandboxExtension::Handle serviceWorkerRegistrationDirectoryExtensionHandle;
    7071#endif
     72
     73    uint64_t perOriginStorageQuota { WebCore::StorageQuotaManager::defaultQuota() };
     74    uint64_t perThirdPartyOriginStorageQuota { WebCore::StorageQuotaManager::defaultThirdPartyQuota() };
    7175};
    7276

  • trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp

    r243632 r243911  
    574574}
    575575
    576 void WKWebsiteDataStoreSetCacheStoragePerOriginQuota(WKWebsiteDataStoreRef dataStoreRef, uint64_t quota)
    577 {
    578     WebKit::toImpl(dataStoreRef)->websiteDataStore().setCacheStoragePerOriginQuota(quota);
     576void WKWebsiteDataStoreSetPerOriginStorageQuota(WKWebsiteDataStoreRef dataStoreRef, uint64_t quota)
     577{
     578    WebKit::toImpl(dataStoreRef)->websiteDataStore().setPerOriginStorageQuota(quota);
    579579}
    580580

  • trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h

    r243632 r243911  
    126126WK_EXPORT void WKWebsiteDataStoreSetServiceWorkerRegistrationDirectory(WKWebsiteDataStoreRef dataStoreRef, WKStringRef serviceWorkerRegistrationDirectory);
    127127
    128 WK_EXPORT void WKWebsiteDataStoreSetCacheStoragePerOriginQuota(WKWebsiteDataStoreRef dataStoreRef, uint64_t quota);
     128WK_EXPORT void WKWebsiteDataStoreSetPerOriginStorageQuota(WKWebsiteDataStoreRef dataStoreRef, uint64_t quota);
    129129
    130130WK_EXPORT void WKWebsiteDataStoreSetWebAuthenticationMockConfiguration(WKWebsiteDataStoreRef dataStoreRef, WKDictionaryRef configuration);

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

    r243829 r243911  
    307307}
    308308
    309 - (NSUInteger)_cacheStoragePerOriginQuota
    310 {
    311     return _websiteDataStore->websiteDataStore().cacheStoragePerOriginQuota();
    312 }
    313 
    314 - (void)_setCacheStoragePerOriginQuota:(NSUInteger)size
    315 {
    316     _websiteDataStore->websiteDataStore().setCacheStoragePerOriginQuota(size);
     309- (NSUInteger)_perOriginStorageQuota
     310{
     311    return _websiteDataStore->websiteDataStore().perOriginStorageQuota();
     312}
     313
     314- (void)_setPerOriginStorageQuota:(NSUInteger)size
     315{
     316    _websiteDataStore->websiteDataStore().setPerOriginStorageQuota(size);
    317317}
    318318

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h

    r243829 r243911  
    4949@property (nonatomic, setter=_setResourceLoadStatisticsEnabled:) BOOL _resourceLoadStatisticsEnabled WK_API_AVAILABLE(macos(10.12), ios(10.0));
    5050@property (nonatomic, setter=_setResourceLoadStatisticsDebugMode:) BOOL _resourceLoadStatisticsDebugMode WK_API_AVAILABLE(macos(10.14), ios(12.0));
    51 @property (nonatomic, setter=_setCacheStoragePerOriginQuota:) NSUInteger _cacheStoragePerOriginQuota WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
     51@property (nonatomic, setter=_setPerOriginStorageQuota:) NSUInteger _perOriginStorageQuota WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
    5252@property (nonatomic, setter=_setCacheStorageDirectory:) NSString* _cacheStorageDirectory WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
    5353@property (nonatomic, setter=_setServiceWorkerRegistrationDirectory:) NSString* _serviceWorkerRegistrationDirectory WK_API_AVAILABLE(macos(10.13.4), ios(11.3));

  • trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp

    r243632 r243911  
    11391139    if (!store) {
    11401140        RELEASE_LOG_ERROR(CacheStorage, "%p - NetworkProcessProxy is unable to retrieve CacheStorage parameters from the given session ID %" PRIu64, this, sessionID.sessionID());
    1141         auto quota = m_processPool.websiteDataStore() ? m_processPool.websiteDataStore()->websiteDataStore().cacheStoragePerOriginQuota() : WebsiteDataStoreConfiguration::defaultCacheStoragePerOriginQuota;
    1142         send(Messages::NetworkProcess::SetCacheStorageParameters { sessionID, quota, { }, { } }, 0);
     1141        send(Messages::NetworkProcess::SetCacheStorageParameters { sessionID, { }, { } }, 0);
    11431142        return;
    11441143    }
    … …  
    11491148        SandboxExtension::createHandleForReadWriteDirectory(cacheStorageDirectory, cacheStorageDirectoryExtensionHandle);
    11501149
    1151     send(Messages::NetworkProcess::SetCacheStorageParameters { sessionID, store->cacheStoragePerOriginQuota(), cacheStorageDirectory, cacheStorageDirectoryExtensionHandle }, 0);
     1150    send(Messages::NetworkProcess::SetCacheStorageParameters { sessionID, cacheStorageDirectory, cacheStorageDirectoryExtensionHandle }, 0);
    11521151}
    11531152

  • trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

    r243829 r243911  
    590590            manualPrevalentResource = networkSessionParameters.resourceLoadStatisticsManualPrevalentResource;
    591591        }
     592
     593        parameters.defaultDataStoreParameters.perOriginStorageQuota = withWebsiteDataStore->perOriginStorageQuota();
     594        parameters.defaultDataStoreParameters.perThirdPartyOriginStorageQuota = withWebsiteDataStore->perThirdPartyOriginStorageQuota();
    592595    } else if (m_websiteDataStore) {
    593596        enableResourceLoadStatistics = m_websiteDataStore->resourceLoadStatisticsEnabled();
    … …  
    598601            manualPrevalentResource = networkSessionParameters.resourceLoadStatisticsManualPrevalentResource;
    599602        }
     603
     604        parameters.defaultDataStoreParameters.perOriginStorageQuota = m_websiteDataStore->websiteDataStore().perOriginStorageQuota();
     605        parameters.defaultDataStoreParameters.perThirdPartyOriginStorageQuota = m_websiteDataStore->websiteDataStore().perThirdPartyOriginStorageQuota();
    600606    }
    601607

  • trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm

    r243829 r243911  
    161161#endif
    162162
     163    parameters.perOriginStorageQuota = perOriginStorageQuota();
     164    parameters.perThirdPartyOriginStorageQuota = perThirdPartyOriginStorageQuota();
     165
    163166    return parameters;
    164167}

  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

    r243829 r243911  
    5151#include <WebCore/SecurityOrigin.h>
    5252#include <WebCore/SecurityOriginData.h>
     53#include <WebCore/StorageQuotaManager.h>
    5354#include <wtf/CallbackAggregator.h>
    5455#include <wtf/CompletionHandler.h>
    … …  
    21032104}
    21042105
     2106uint64_t WebsiteDataStore::perThirdPartyOriginStorageQuota() const
     2107{
     2108    // FIXME: Consider whether allowing to set a perThirdPartyOriginStorageQuota from a WebsiteDataStore.
     2109    return WebCore::StorageQuotaManager::defaultThirdPartyQuotaFromPerOriginQuota(perOriginStorageQuota());
     2110}
     2111
    21052112#if !PLATFORM(COCOA)
    21062113WebsiteDataStoreParameters WebsiteDataStore::parameters()
    … …  
    21232130#endif
    21242131
     2132    parameters.perOriginStorageQuota = perOriginStorageQuota();
     2133    parameters.perThirdPartyOriginStorageQuota = perThirdPartyOriginStorageQuota();
     2134
    21252135    platformSetNetworkParameters(parameters);
    21262136

  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h

    r243829 r243911  
    108108    void setResourceLoadStatisticsDebugMode(bool, CompletionHandler<void()>&&);
    109109
    110     uint64_t cacheStoragePerOriginQuota() const { return m_resolvedConfiguration->cacheStoragePerOriginQuota(); }
    111     void setCacheStoragePerOriginQuota(uint64_t quota) { m_resolvedConfiguration->setCacheStoragePerOriginQuota(quota); }
     110    uint64_t perOriginStorageQuota() const { return m_resolvedConfiguration->perOriginStorageQuota(); }
     111    uint64_t perThirdPartyOriginStorageQuota() const;
     112    void setPerOriginStorageQuota(uint64_t quota) { m_resolvedConfiguration->setPerOriginStorageQuota(quota); }
    112113    const String& cacheStorageDirectory() const { return m_resolvedConfiguration->cacheStorageDirectory(); }
    113114    void setCacheStorageDirectory(String&& directory) { m_resolvedConfiguration->setCacheStorageDirectory(WTFMove(directory)); }

  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp

    r239322 r243911  
    4141
    4242    copy->m_cacheStorageDirectory = this->m_cacheStorageDirectory;
    43     copy->m_cacheStoragePerOriginQuota = this->m_cacheStoragePerOriginQuota;
     43    copy->m_perOriginStorageQuota = this->m_perOriginStorageQuota;
    4444    copy->m_networkCacheDirectory = this->m_networkCacheDirectory;
    4545    copy->m_applicationCacheDirectory = this->m_applicationCacheDirectory;

  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h

    r239513 r243911  
    3838    Ref<WebsiteDataStoreConfiguration> copy();
    3939
    40     uint64_t cacheStoragePerOriginQuota() { return m_cacheStoragePerOriginQuota; }
    41     void setCacheStoragePerOriginQuota(uint64_t quota) { m_cacheStoragePerOriginQuota = quota; }
     40    uint64_t perOriginStorageQuota() { return m_perOriginStorageQuota; }
     41    void setPerOriginStorageQuota(uint64_t quota) { m_perOriginStorageQuota = quota; }
    4242
    4343    const String& applicationCacheDirectory() const { return m_applicationCacheDirectory; }
    … …  
    9898    void setHTTPSProxy(URL&& proxy) { m_httpsProxy = WTFMove(proxy); }
    9999
    100     constexpr static uint64_t defaultCacheStoragePerOriginQuota = 50 * 1024 * 1024;
     100    constexpr static uint64_t defaultPerOriginStorageQuota = 50 * 1024 * 1024;
    101101
    102102private:
    … …  
    104104
    105105    String m_cacheStorageDirectory;
    106     uint64_t m_cacheStoragePerOriginQuota { defaultCacheStoragePerOriginQuota };
     106    uint64_t m_perOriginStorageQuota { defaultPerOriginStorageQuota };
    107107    String m_networkCacheDirectory;
    108108    String m_applicationCacheDirectory;

  • trunk/Tools/ChangeLog

    r243897 r243911  
     12019-04-04  Youenn Fablet  <youenn@apple.com>
     2
     3        Pass storage quota parameters from UIProcess to NetworkProcess as part of WebsiteDataStore parameters
     4        https://bugs.webkit.org/show_bug.cgi?id=196543
     5
     6        Reviewed by Alex Christensen.
     7
     8        * WebKitTestRunner/TestController.cpp:
     9        (WTR::TestController::generatePageConfiguration):
     10
    1112019-04-04  Aakash Jain  <aakash_jain@apple.com>
    212

  • trunk/Tools/WebKitTestRunner/TestController.cpp

    r243783 r243911  
    524524
    525525        auto* websiteDataStore = WKContextGetWebsiteDataStore(m_context.get());
    526         WKWebsiteDataStoreSetCacheStoragePerOriginQuota(websiteDataStore, 400 * 1024);
     526        WKWebsiteDataStoreSetPerOriginStorageQuota(websiteDataStore, 400 * 1024);
    527527
    528528        platformInitializeContext();
Note: See TracChangeset for help on using the changeset viewer.