Changeset 250150 in webkit


Ignore:
Timestamp:
Sep 20, 2019 2:01:10 PM (5 years ago)
Author:
achristensen@apple.com
Message:

Begin moving WebsiteDataStore setters to WebsiteDataStoreConfiguration
​https://bugs.webkit.org/show_bug.cgi?id=202025

Reviewed by Chris Dumez.

Most of these were only needed before initNonPersistentConfiguration existed.

  • UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.cpp:

(WKWebsiteDataStoreConfigurationGetPerOriginStorageQuota):
(WKWebsiteDataStoreConfigurationSetPerOriginStorageQuota):

  • UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.h:
  • UIProcess/API/C/WKWebsiteDataStoreRef.cpp:

(WKWebsiteDataStoreSetPerOriginStorageQuota):

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

(-[WKWebsiteDataStore _initWithConfiguration:]):
(-[WKWebsiteDataStore _perOriginStorageQuota]):
(-[WKWebsiteDataStore _setPerOriginStorageQuota:]):

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

(-[_WKWebsiteDataStoreConfiguration perOriginStorageQuota]):
(-[_WKWebsiteDataStoreConfiguration setPerOriginStorageQuota:]):
(-[_WKWebsiteDataStoreConfiguration boundInterfaceIdentifier]):
(-[_WKWebsiteDataStoreConfiguration setBoundInterfaceIdentifier:]):
(-[_WKWebsiteDataStoreConfiguration allowsCellularAccess]):
(-[_WKWebsiteDataStoreConfiguration setAllowsCellularAccess:]):
(-[_WKWebsiteDataStoreConfiguration proxyConfiguration]):
(-[_WKWebsiteDataStoreConfiguration setProxyConfiguration:]):

  • UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:

(WebKit::WebsiteDataStore::parameters):

  • UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::WebsiteDataStore):
(WebKit::WebsiteDataStore::setSourceApplicationSecondaryIdentifier):
(WebKit::WebsiteDataStore::setSourceApplicationBundleIdentifier):

  • UIProcess/WebsiteData/WebsiteDataStore.h:

(WebKit::WebsiteDataStore::setBoundInterfaceIdentifier):
(WebKit::WebsiteDataStore::boundInterfaceIdentifier):
(WebKit::WebsiteDataStore::sourceApplicationBundleIdentifier const):
(WebKit::WebsiteDataStore::sourceApplicationSecondaryIdentifier const):
(WebKit::WebsiteDataStore::setAllowsCellularAccess):
(WebKit::WebsiteDataStore::allowsCellularAccess):
(WebKit::WebsiteDataStore::setProxyConfiguration):
(WebKit::WebsiteDataStore::proxyConfiguration):
(WebKit::WebsiteDataStore::setPerOriginStorageQuota): Deleted.

  • UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp:

(WebKit::WebsiteDataStoreConfiguration::copy):

  • UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h:

(WebKit::WebsiteDataStoreConfiguration::boundInterfaceIdentifier const):
(WebKit::WebsiteDataStoreConfiguration::setBoundInterfaceIdentifier):
(WebKit::WebsiteDataStoreConfiguration::allowsCellularAccess const):
(WebKit::WebsiteDataStoreConfiguration::setAllowsCellularAccess):
(WebKit::WebsiteDataStoreConfiguration::proxyConfiguration const):
(WebKit::WebsiteDataStoreConfiguration::setProxyConfiguration):

Location:
trunk/Source/WebKit
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r250148 r250150  
     12019-09-20  Alex Christensen  <achristensen@webkit.org>
     2
     3        Begin moving WebsiteDataStore setters to WebsiteDataStoreConfiguration
     4        https://bugs.webkit.org/show_bug.cgi?id=202025
     5
     6        Reviewed by Chris Dumez.
     7
     8        Most of these were only needed before initNonPersistentConfiguration existed.
     9
     10        * UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.cpp:
     11        (WKWebsiteDataStoreConfigurationGetPerOriginStorageQuota):
     12        (WKWebsiteDataStoreConfigurationSetPerOriginStorageQuota):
     13        * UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.h:
     14        * UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
     15        (WKWebsiteDataStoreSetPerOriginStorageQuota):
     16        * UIProcess/API/C/WKWebsiteDataStoreRef.h:
     17        * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
     18        (-[WKWebsiteDataStore _initWithConfiguration:]):
     19        (-[WKWebsiteDataStore _perOriginStorageQuota]):
     20        (-[WKWebsiteDataStore _setPerOriginStorageQuota:]):
     21        * UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h:
     22        * UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h:
     23        * UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm:
     24        (-[_WKWebsiteDataStoreConfiguration perOriginStorageQuota]):
     25        (-[_WKWebsiteDataStoreConfiguration setPerOriginStorageQuota:]):
     26        (-[_WKWebsiteDataStoreConfiguration boundInterfaceIdentifier]):
     27        (-[_WKWebsiteDataStoreConfiguration setBoundInterfaceIdentifier:]):
     28        (-[_WKWebsiteDataStoreConfiguration allowsCellularAccess]):
     29        (-[_WKWebsiteDataStoreConfiguration setAllowsCellularAccess:]):
     30        (-[_WKWebsiteDataStoreConfiguration proxyConfiguration]):
     31        (-[_WKWebsiteDataStoreConfiguration setProxyConfiguration:]):
     32        * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
     33        (WebKit::WebsiteDataStore::parameters):
     34        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
     35        (WebKit::WebsiteDataStore::WebsiteDataStore):
     36        (WebKit::WebsiteDataStore::setSourceApplicationSecondaryIdentifier):
     37        (WebKit::WebsiteDataStore::setSourceApplicationBundleIdentifier):
     38        * UIProcess/WebsiteData/WebsiteDataStore.h:
     39        (WebKit::WebsiteDataStore::setBoundInterfaceIdentifier):
     40        (WebKit::WebsiteDataStore::boundInterfaceIdentifier):
     41        (WebKit::WebsiteDataStore::sourceApplicationBundleIdentifier const):
     42        (WebKit::WebsiteDataStore::sourceApplicationSecondaryIdentifier const):
     43        (WebKit::WebsiteDataStore::setAllowsCellularAccess):
     44        (WebKit::WebsiteDataStore::allowsCellularAccess):
     45        (WebKit::WebsiteDataStore::setProxyConfiguration):
     46        (WebKit::WebsiteDataStore::proxyConfiguration):
     47        (WebKit::WebsiteDataStore::setPerOriginStorageQuota): Deleted.
     48        * UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp:
     49        (WebKit::WebsiteDataStoreConfiguration::copy):
     50        * UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h:
     51        (WebKit::WebsiteDataStoreConfiguration::boundInterfaceIdentifier const):
     52        (WebKit::WebsiteDataStoreConfiguration::setBoundInterfaceIdentifier):
     53        (WebKit::WebsiteDataStoreConfiguration::allowsCellularAccess const):
     54        (WebKit::WebsiteDataStoreConfiguration::setAllowsCellularAccess):
     55        (WebKit::WebsiteDataStoreConfiguration::proxyConfiguration const):
     56        (WebKit::WebsiteDataStoreConfiguration::setProxyConfiguration):
     57
    1582019-09-20  Alex Christensen  <achristensen@webkit.org>
    259

  • trunk/Source/WebKit/UIProcess/API/APIWebsiteDataStore.cpp

    r249778 r250150  
    152152    configuration->setNetworkCacheDirectory(defaultNetworkCacheDirectory());
    153153    configuration->setMediaCacheDirectory(defaultMediaCacheDirectory());
    154 
     154    configuration->setResourceLoadStatisticsDirectory(defaultResourceLoadStatisticsDirectory());
    155155    configuration->setIndexedDBDatabaseDirectory(defaultIndexedDBDatabaseDirectory());
    156156    configuration->setServiceWorkerRegistrationDirectory(defaultServiceWorkerRegistrationDirectory());

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

    r249614 r250150  
    111111    WebKit::toImpl(configuration)->setResourceLoadStatisticsDirectory(WebKit::toImpl(directory)->string());
    112112}
     113
     114uint64_t WKWebsiteDataStoreConfigurationGetPerOriginStorageQuota(WKWebsiteDataStoreConfigurationRef configuration)
     115{
     116    return WebKit::toImpl(configuration)->perOriginStorageQuota();
     117}
     118
     119void WKWebsiteDataStoreConfigurationSetPerOriginStorageQuota(WKWebsiteDataStoreConfigurationRef configuration, uint64_t quota)
     120{
     121    return WebKit::toImpl(configuration)->setPerOriginStorageQuota(quota);
     122}

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

    r249614 r250150  
    5757WK_EXPORT WKStringRef WKWebsiteDataStoreConfigurationCopyResourceLoadStatisticsDirectory(WKWebsiteDataStoreConfigurationRef configuration);
    5858WK_EXPORT void WKWebsiteDataStoreConfigurationSetResourceLoadStatisticsDirectory(WKWebsiteDataStoreConfigurationRef configuration, WKStringRef directory);
    59    
     59
     60WK_EXPORT uint64_t WKWebsiteDataStoreConfigurationGetPerOriginStorageQuota(WKWebsiteDataStoreConfigurationRef configuration);
     61WK_EXPORT void WKWebsiteDataStoreConfigurationSetPerOriginStorageQuota(WKWebsiteDataStoreConfigurationRef configuration, uint64_t quota);
     62
    6063#ifdef __cplusplus
    6164}

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

    r249778 r250150  
    606606}
    607607
    608 void WKWebsiteDataStoreSetPerOriginStorageQuota(WKWebsiteDataStoreRef dataStoreRef, uint64_t quota)
    609 {
    610     WebKit::toImpl(dataStoreRef)->websiteDataStore().setPerOriginStorageQuota(quota);
     608void WKWebsiteDataStoreSetPerOriginStorageQuota(WKWebsiteDataStoreRef, uint64_t)
     609{
    611610}
    612611

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

    r249614 r250150  
    2828
    2929#include <WebKit/WKBase.h>
     30#include <WebKit/WKDeprecated.h>
    3031
    3132#ifdef __cplusplus
    … …  
    134135WK_EXPORT void WKWebsiteDataStoreSetServiceWorkerRegistrationDirectory(WKWebsiteDataStoreRef dataStoreRef, WKStringRef serviceWorkerRegistrationDirectory);
    135136
    136 WK_EXPORT void WKWebsiteDataStoreSetPerOriginStorageQuota(WKWebsiteDataStoreRef dataStoreRef, uint64_t quota);
     137WK_EXPORT void WKWebsiteDataStoreSetPerOriginStorageQuota(WKWebsiteDataStoreRef dataStoreRef, uint64_t quota) WK_C_API_DEPRECATED_WITH_REPLACEMENT(WKWebsiteDataStoreConfigurationSetPerOriginStorageQuota);
    137138
    138139WK_EXPORT void WKWebsiteDataStoreSetWebAuthenticationMockConfiguration(WKWebsiteDataStoreRef dataStoreRef, WKDictionaryRef configuration);

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

    r250144 r250150  
    308308    if (configuration.httpsProxy)
    309309        config->setHTTPSProxy(configuration.httpsProxy);
     310
     311    config->setAllowsCellularAccess(configuration.allowsCellularAccess);
     312    config->setPerOriginStorageQuota(configuration.perOriginStorageQuota);
     313    config->setBoundInterfaceIdentifier(configuration.boundInterfaceIdentifier);
     314    config->setProxyConfiguration((__bridge CFDictionaryRef)[[configuration.proxyConfiguration copy] autorelease]);
    310315    config->setDeviceManagementRestrictionsEnabled(configuration.deviceManagementRestrictionsEnabled);
    311316    config->setAllLoadsBlockedByDeviceManagementRestrictionsForTesting(configuration.allLoadsBlockedByDeviceManagementRestrictionsForTesting);
    … …  
    367372- (NSUInteger)_perOriginStorageQuota
    368373{
    369     return _websiteDataStore->websiteDataStore().perOriginStorageQuota();
     374    return 0;
    370375}
    371376
    372377- (void)_setPerOriginStorageQuota:(NSUInteger)size
    373378{
    374     _websiteDataStore->websiteDataStore().setPerOriginStorageQuota(size);
    375379}
    376380

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

    r246500 r250150  
    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=_setPerOriginStorageQuota:) NSUInteger _perOriginStorageQuota WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
    52 @property (nonatomic, setter=_setCacheStorageDirectory:) NSString* _cacheStorageDirectory WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
    53 @property (nonatomic, setter=_setServiceWorkerRegistrationDirectory:) NSString* _serviceWorkerRegistrationDirectory WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
     51@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));
     52@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));
     53@property (nonatomic, setter=_setServiceWorkerRegistrationDirectory:) NSString* _serviceWorkerRegistrationDirectory WK_API_DEPRECATED_WITH_REPLACEMENT("_WKWebsiteDataStoreConfiguration.serviceWorkerRegistrationDirectory", macos(10.13.4, WK_MAC_TBA), ios(11.3, WK_IOS_TBA));
    5454
    55 @property (nonatomic, setter=_setBoundInterfaceIdentifier:) NSString *_boundInterfaceIdentifier WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
    56 @property (nonatomic, setter=_setAllowsCellularAccess:) BOOL _allowsCellularAccess WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
    57 @property (nonatomic, setter=_setProxyConfiguration:) NSDictionary *_proxyConfiguration WK_API_AVAILABLE(macos(10.14), ios(12.0));
    58 @property (nonatomic, copy, setter=_setSourceApplicationBundleIdentifier:) NSString *_sourceApplicationBundleIdentifier WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
    59 @property (nonatomic, copy, setter=_setSourceApplicationSecondaryIdentifier:) NSString *_sourceApplicationSecondaryIdentifier WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
     55@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));
     56@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));
     57@property (nonatomic, setter=_setProxyConfiguration:) NSDictionary *_proxyConfiguration WK_API_DEPRECATED_WITH_REPLACEMENT("_WKWebsiteDataStoreConfiguration.proxyConfiguration", macos(10.14, WK_MAC_TBA), ios(12.0, WK_IOS_TBA));
     58@property (nonatomic, copy, setter=_setSourceApplicationBundleIdentifier:) NSString *_sourceApplicationBundleIdentifier WK_API_DEPRECATED_WITH_REPLACEMENT("_WKWebsiteDataStoreConfiguration.sourceApplicationBundleIdentifier", macos(10.14.4, WK_MAC_TBA), ios(12.2, WK_IOS_TBA));
     59@property (nonatomic, copy, setter=_setSourceApplicationSecondaryIdentifier:) NSString *_sourceApplicationSecondaryIdentifier WK_API_DEPRECATED_WITH_REPLACEMENT("_WKWebsiteDataStoreConfiguration.setSourceApplicationSecondaryIdentifier", macos(10.14.4, WK_MAC_TBA), ios(12.2, WK_IOS_TBA));
    6060@property (nonatomic, setter=_setAllowsTLSFallback:) BOOL _allowsTLSFallback WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    6161

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

    r247733 r250150  
    4444@property (nonatomic, nullable, copy, setter=setHTTPSProxy:) NSURL *httpsProxy WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
    4545@property (nonatomic) BOOL deviceManagementRestrictionsEnabled WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
     46@property (nonatomic) NSUInteger perOriginStorageQuota WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
     47@property (nonatomic, nullable, copy) NSString *boundInterfaceIdentifier WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
     48@property (nonatomic) BOOL allowsCellularAccess WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
     49@property (nonatomic, nullable, copy) NSDictionary *proxyConfiguration WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    4650
    4751// These properties only make sense for persistent data stores, and will throw

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

    r247733 r250150  
    4343        return nil;
    4444
     45    API::Object::constructInWrapper<WebKit::WebsiteDataStoreConfiguration>(self);
    4546    _configuration->setPersistent(true);
    4647
    … …  
    5455        return nil;
    5556
     57    API::Object::constructInWrapper<WebKit::WebsiteDataStoreConfiguration>(self);
    5658    _configuration->setPersistent(false);
    5759
    5860    return self;
     61}
     62
     63- (void)dealloc
     64{
     65    _configuration->~WebsiteDataStoreConfiguration();
     66    [super dealloc];
    5967}
    6068
    … …  
    285293}
    286294
     295- (NSUInteger)perOriginStorageQuota
     296{
     297    return _configuration->perOriginStorageQuota();
     298}
     299
     300- (void)setPerOriginStorageQuota:(NSUInteger)quota
     301{
     302    _configuration->setPerOriginStorageQuota(quota);
     303}
     304
     305- (NSString *)boundInterfaceIdentifier
     306{
     307    return _configuration->boundInterfaceIdentifier();
     308}
     309
     310- (void)setBoundInterfaceIdentifier:(NSString *)identifier
     311{
     312    _configuration->setBoundInterfaceIdentifier(identifier);
     313}
     314
     315- (BOOL)allowsCellularAccess
     316{
     317    return _configuration->allowsCellularAccess();
     318}
     319
     320- (void)setAllowsCellularAccess:(BOOL)allows
     321{
     322    _configuration->setAllowsCellularAccess(allows);
     323}
     324
     325- (NSDictionary *)proxyConfiguration
     326{
     327    return (__bridge NSDictionary *)_configuration->proxyConfiguration();
     328}
     329
     330- (void)setProxyConfiguration:(NSDictionary *)configuration
     331{
     332    _configuration->setProxyConfiguration((__bridge CFDictionaryRef)[configuration copy]);
     333}
     334
    287335- (BOOL)allLoadsBlockedByDeviceManagementRestrictionsForTesting
    288336{

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

    r250144 r250150  
    120120    parameters.networkSessionParameters = {
    121121        m_sessionID,
    122         m_boundInterfaceIdentifier,
    123         m_allowsCellularAccess,
    124         m_proxyConfiguration,
    125         m_sourceApplicationBundleIdentifier,
    126         m_sourceApplicationSecondaryIdentifier,
     122        boundInterfaceIdentifier(),
     123        allowsCellularAccess(),
     124        proxyConfiguration(),
     125        sourceApplicationBundleIdentifier(),
     126        sourceApplicationSecondaryIdentifier(),
    127127        shouldLogCookieInformation,
    128128        Seconds { [defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey] / 1000. },
    … …  
    155155
    156156    parameters.uiProcessCookieStorageIdentifier = m_uiProcessCookieStorageIdentifier;
    157     parameters.networkSessionParameters.sourceApplicationBundleIdentifier = m_sourceApplicationBundleIdentifier;
    158     parameters.networkSessionParameters.sourceApplicationSecondaryIdentifier = m_sourceApplicationSecondaryIdentifier;
     157    parameters.networkSessionParameters.sourceApplicationBundleIdentifier = sourceApplicationBundleIdentifier();
     158    parameters.networkSessionParameters.sourceApplicationSecondaryIdentifier = sourceApplicationSecondaryIdentifier();
    159159
    160160    parameters.pendingCookies = copyToVector(m_pendingCookies);

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

    r250144 r250150  
    103103    , m_deviceIdHashSaltStorage(DeviceIdHashSaltStorage::create(isPersistent() ? m_configuration->deviceIdHashSaltsStorageDirectory() : String()))
    104104    , m_queue(WorkQueue::create("com.apple.WebKit.WebsiteDataStore"))
    105     , m_sourceApplicationBundleIdentifier(m_configuration->sourceApplicationBundleIdentifier())
    106     , m_sourceApplicationSecondaryIdentifier(m_configuration->sourceApplicationSecondaryIdentifier())
    107105#if ENABLE(WEB_AUTHN)
    108106    , m_authenticatorManager(makeUniqueRef<AuthenticatorManager>())
    … …  
    20292027    if (m_networkingHasBegun)
    20302028        return false;
    2031     m_sourceApplicationSecondaryIdentifier = WTFMove(identifier);
     2029    m_resolvedConfiguration->setSourceApplicationSecondaryIdentifier(WTFMove(identifier));
    20322030    return true;
    20332031}
    … …  
    20372035    if (m_networkingHasBegun)
    20382036        return false;
    2039     m_sourceApplicationBundleIdentifier = WTFMove(identifier);
     2037    m_resolvedConfiguration->setSourceApplicationBundleIdentifier(WTFMove(identifier));
    20402038    return true;
    20412039}

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

    r250144 r250150  
    117117    uint64_t perOriginStorageQuota() const { return m_resolvedConfiguration->perOriginStorageQuota(); }
    118118    uint64_t perThirdPartyOriginStorageQuota() const;
    119     void setPerOriginStorageQuota(uint64_t quota) { m_resolvedConfiguration->setPerOriginStorageQuota(quota); }
    120119    const String& cacheStorageDirectory() const { return m_resolvedConfiguration->cacheStorageDirectory(); }
    121120    void setCacheStorageDirectory(String&& directory) { m_resolvedConfiguration->setCacheStorageDirectory(WTFMove(directory)); }
    … …  
    211210    void clearPendingCookies();
    212211
    213     void setBoundInterfaceIdentifier(String&& identifier) { m_boundInterfaceIdentifier = WTFMove(identifier); }
    214     const String& boundInterfaceIdentifier() { return m_boundInterfaceIdentifier; }
    215 
    216     const String& sourceApplicationBundleIdentifier() const { return m_sourceApplicationBundleIdentifier; }
     212    void setBoundInterfaceIdentifier(String&& identifier) { m_resolvedConfiguration->setBoundInterfaceIdentifier(WTFMove(identifier)); }
     213    const String& boundInterfaceIdentifier() { return m_resolvedConfiguration->boundInterfaceIdentifier(); }
     214
     215    const String& sourceApplicationBundleIdentifier() const { return m_resolvedConfiguration->sourceApplicationBundleIdentifier(); }
    217216    bool setSourceApplicationBundleIdentifier(String&&);
    218217
    219     const String& sourceApplicationSecondaryIdentifier() const { return m_sourceApplicationSecondaryIdentifier; }
     218    const String& sourceApplicationSecondaryIdentifier() const { return m_resolvedConfiguration->sourceApplicationSecondaryIdentifier(); }
    220219    bool setSourceApplicationSecondaryIdentifier(String&&);
    221220
    222221    void networkingHasBegun() { m_networkingHasBegun = true; }
    223222   
    224     void setAllowsCellularAccess(AllowsCellularAccess allows) { m_allowsCellularAccess = allows; }
    225     AllowsCellularAccess allowsCellularAccess() { return m_allowsCellularAccess; }
     223    void setAllowsCellularAccess(AllowsCellularAccess allows) { m_resolvedConfiguration->setAllowsCellularAccess(allows == AllowsCellularAccess::Yes); }
     224    AllowsCellularAccess allowsCellularAccess() { return m_resolvedConfiguration->allowsCellularAccess() ? AllowsCellularAccess::Yes : AllowsCellularAccess::No; }
    226225
    227226#if PLATFORM(COCOA)
    228     void setProxyConfiguration(CFDictionaryRef configuration) { m_proxyConfiguration = configuration; }
    229     CFDictionaryRef proxyConfiguration() { return m_proxyConfiguration.get(); }
     227    void setProxyConfiguration(CFDictionaryRef configuration) { m_resolvedConfiguration->setProxyConfiguration(configuration); }
     228    CFDictionaryRef proxyConfiguration() { return m_resolvedConfiguration->proxyConfiguration(); }
    230229#endif
    231230
    … …  
    309308    Vector<uint8_t> m_uiProcessCookieStorageIdentifier;
    310309    RetainPtr<CFHTTPCookieStorageRef> m_cfCookieStorage;
    311     RetainPtr<CFDictionaryRef> m_proxyConfiguration;
    312310#endif
    313311
    … …  
    320318    WeakHashSet<WebProcessProxy> m_processes;
    321319
    322     String m_boundInterfaceIdentifier;
    323     AllowsCellularAccess m_allowsCellularAccess { AllowsCellularAccess::Yes };
    324     String m_sourceApplicationBundleIdentifier;
    325     String m_sourceApplicationSecondaryIdentifier;
    326320    bool m_networkingHasBegun { false };
    327321

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

    r249778 r250150  
    3131namespace WebKit {
    3232
    33 WebsiteDataStoreConfiguration::WebsiteDataStoreConfiguration()
    34     : m_resourceLoadStatisticsDirectory(API::WebsiteDataStore::defaultResourceLoadStatisticsDirectory())
    35 {
    36 }
     33WebsiteDataStoreConfiguration::WebsiteDataStoreConfiguration() = default;
    3734
    3835Ref<WebsiteDataStoreConfiguration> WebsiteDataStoreConfiguration::copy()
    … …  
    6663    copy->m_deviceManagementRestrictionsEnabled = this->m_deviceManagementRestrictionsEnabled;
    6764    copy->m_allLoadsBlockedByDeviceManagementRestrictionsForTesting = this->m_allLoadsBlockedByDeviceManagementRestrictionsForTesting;
     65    copy->m_boundInterfaceIdentifier = this->m_boundInterfaceIdentifier;
     66    copy->m_allowsCellularAccess = this->m_allowsCellularAccess;
     67#if PLATFORM(COCOA)
     68    if (m_proxyConfiguration)
     69        copy->m_proxyConfiguration = adoptCF(CFDictionaryCreateCopy(nullptr, this->m_proxyConfiguration.get()));
     70#endif
    6871
    6972    return copy;

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

    r250143 r250150  
    3636public:
    3737    static Ref<WebsiteDataStoreConfiguration> create() { return adoptRef(*new WebsiteDataStoreConfiguration); }
     38    WebsiteDataStoreConfiguration();
    3839
    3940    Ref<WebsiteDataStoreConfiguration> copy();
    … …  
    6970    void setLocalStorageDirectory(String&& directory) { m_localStorageDirectory = WTFMove(directory); }
    7071
     72    const String& boundInterfaceIdentifier() const { return m_boundInterfaceIdentifier; }
     73    void setBoundInterfaceIdentifier(String&& identifier) { m_boundInterfaceIdentifier = WTFMove(identifier); }
     74
     75    bool allowsCellularAccess() const { return m_allowsCellularAccess; }
     76    void setAllowsCellularAccess(bool allows) { m_allowsCellularAccess = allows; }
     77
     78#if PLATFORM(COCOA)
     79    CFDictionaryRef proxyConfiguration() const { return m_proxyConfiguration.get(); }
     80    void setProxyConfiguration(CFDictionaryRef configuration) { m_proxyConfiguration = configuration; }
     81#endif
     82   
    7183    const String& deviceIdHashSaltsStorageDirectory() const { return m_deviceIdHashSaltsStorageDirectory; }
    7284    void setDeviceIdHashSaltsStorageDirectory(String&& directory) { m_deviceIdHashSaltsStorageDirectory = WTFMove(directory); }
    … …  
    109121
    110122private:
    111     WebsiteDataStoreConfiguration();
    112 
    113123    bool m_isPersistent { false };
    114124
    … …  
    133143    String m_sourceApplicationBundleIdentifier;
    134144    String m_sourceApplicationSecondaryIdentifier;
     145    String m_boundInterfaceIdentifier;
    135146    URL m_httpProxy;
    136147    URL m_httpsProxy;
    137148    bool m_deviceManagementRestrictionsEnabled { false };
    138149    bool m_allLoadsBlockedByDeviceManagementRestrictionsForTesting { false };
     150    bool m_allowsCellularAccess { true };
     151#if PLATFORM(COCOA)
     152    RetainPtr<CFDictionaryRef> m_proxyConfiguration;
     153#endif
    139154};
    140155
Note: See TracChangeset for help on using the changeset viewer.