Diff
Modified: trunk/Source/WebKit/ChangeLog (250149 => 250150)
--- trunk/Source/WebKit/ChangeLog 2019-09-20 20:49:47 UTC (rev 250149)
+++ trunk/Source/WebKit/ChangeLog 2019-09-20 21:01:10 UTC (rev 250150)
@@ -1,5 +1,62 @@
2019-09-20 Alex Christensen <achristen...@webkit.org>
+ 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):
+
+2019-09-20 Alex Christensen <achristen...@webkit.org>
+
Introduce LegacyGlobalSettings for settings the NetworkProcess needs from a WebProcessPool
https://bugs.webkit.org/show_bug.cgi?id=201970
Modified: trunk/Source/WebKit/UIProcess/API/APIWebsiteDataStore.cpp (250149 => 250150)
--- trunk/Source/WebKit/UIProcess/API/APIWebsiteDataStore.cpp 2019-09-20 20:49:47 UTC (rev 250149)
+++ trunk/Source/WebKit/UIProcess/API/APIWebsiteDataStore.cpp 2019-09-20 21:01:10 UTC (rev 250150)
@@ -151,7 +151,7 @@
configuration->setCacheStorageDirectory(defaultCacheStorageDirectory());
configuration->setNetworkCacheDirectory(defaultNetworkCacheDirectory());
configuration->setMediaCacheDirectory(defaultMediaCacheDirectory());
-
+ configuration->setResourceLoadStatisticsDirectory(defaultResourceLoadStatisticsDirectory());
configuration->setIndexedDBDatabaseDirectory(defaultIndexedDBDatabaseDirectory());
configuration->setServiceWorkerRegistrationDirectory(defaultServiceWorkerRegistrationDirectory());
configuration->setWebSQLDatabaseDirectory(defaultWebSQLDatabaseDirectory());
Modified: trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.cpp (250149 => 250150)
--- trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.cpp 2019-09-20 20:49:47 UTC (rev 250149)
+++ trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.cpp 2019-09-20 21:01:10 UTC (rev 250150)
@@ -110,3 +110,13 @@
{
WebKit::toImpl(configuration)->setResourceLoadStatisticsDirectory(WebKit::toImpl(directory)->string());
}
+
+uint64_t WKWebsiteDataStoreConfigurationGetPerOriginStorageQuota(WKWebsiteDataStoreConfigurationRef configuration)
+{
+ return WebKit::toImpl(configuration)->perOriginStorageQuota();
+}
+
+void WKWebsiteDataStoreConfigurationSetPerOriginStorageQuota(WKWebsiteDataStoreConfigurationRef configuration, uint64_t quota)
+{
+ return WebKit::toImpl(configuration)->setPerOriginStorageQuota(quota);
+}
Modified: trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.h (250149 => 250150)
--- trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.h 2019-09-20 20:49:47 UTC (rev 250149)
+++ trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.h 2019-09-20 21:01:10 UTC (rev 250150)
@@ -56,7 +56,10 @@
WK_EXPORT WKStringRef WKWebsiteDataStoreConfigurationCopyResourceLoadStatisticsDirectory(WKWebsiteDataStoreConfigurationRef configuration);
WK_EXPORT void WKWebsiteDataStoreConfigurationSetResourceLoadStatisticsDirectory(WKWebsiteDataStoreConfigurationRef configuration, WKStringRef directory);
-
+
+WK_EXPORT uint64_t WKWebsiteDataStoreConfigurationGetPerOriginStorageQuota(WKWebsiteDataStoreConfigurationRef configuration);
+WK_EXPORT void WKWebsiteDataStoreConfigurationSetPerOriginStorageQuota(WKWebsiteDataStoreConfigurationRef configuration, uint64_t quota);
+
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp (250149 => 250150)
--- trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp 2019-09-20 20:49:47 UTC (rev 250149)
+++ trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp 2019-09-20 21:01:10 UTC (rev 250150)
@@ -605,9 +605,8 @@
WebKit::toImpl(dataStoreRef)->websiteDataStore().setServiceWorkerRegistrationDirectory(WebKit::toImpl(serviceWorkerRegistrationDirectory)->string());
}
-void WKWebsiteDataStoreSetPerOriginStorageQuota(WKWebsiteDataStoreRef dataStoreRef, uint64_t quota)
+void WKWebsiteDataStoreSetPerOriginStorageQuota(WKWebsiteDataStoreRef, uint64_t)
{
- WebKit::toImpl(dataStoreRef)->websiteDataStore().setPerOriginStorageQuota(quota);
}
void WKWebsiteDataStoreClearAllDeviceOrientationPermissions(WKWebsiteDataStoreRef dataStoreRef)
Modified: trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h (250149 => 250150)
--- trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h 2019-09-20 20:49:47 UTC (rev 250149)
+++ trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h 2019-09-20 21:01:10 UTC (rev 250150)
@@ -27,6 +27,7 @@
#define WKWebsiteDataStoreRef_h
#include <WebKit/WKBase.h>
+#include <WebKit/WKDeprecated.h>
#ifdef __cplusplus
extern "C" {
@@ -133,7 +134,7 @@
WK_EXPORT WKStringRef WKWebsiteDataStoreCopyServiceWorkerRegistrationDirectory(WKWebsiteDataStoreRef dataStoreRef);
WK_EXPORT void WKWebsiteDataStoreSetServiceWorkerRegistrationDirectory(WKWebsiteDataStoreRef dataStoreRef, WKStringRef serviceWorkerRegistrationDirectory);
-WK_EXPORT void WKWebsiteDataStoreSetPerOriginStorageQuota(WKWebsiteDataStoreRef dataStoreRef, uint64_t quota);
+WK_EXPORT void WKWebsiteDataStoreSetPerOriginStorageQuota(WKWebsiteDataStoreRef dataStoreRef, uint64_t quota) WK_C_API_DEPRECATED_WITH_REPLACEMENT(WKWebsiteDataStoreConfigurationSetPerOriginStorageQuota);
WK_EXPORT void WKWebsiteDataStoreSetWebAuthenticationMockConfiguration(WKWebsiteDataStoreRef dataStoreRef, WKDictionaryRef configuration);
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (250149 => 250150)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2019-09-20 20:49:47 UTC (rev 250149)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2019-09-20 21:01:10 UTC (rev 250150)
@@ -307,6 +307,11 @@
config->setHTTPProxy(configuration.httpProxy);
if (configuration.httpsProxy)
config->setHTTPSProxy(configuration.httpsProxy);
+
+ config->setAllowsCellularAccess(configuration.allowsCellularAccess);
+ config->setPerOriginStorageQuota(configuration.perOriginStorageQuota);
+ config->setBoundInterfaceIdentifier(configuration.boundInterfaceIdentifier);
+ config->setProxyConfiguration((__bridge CFDictionaryRef)[[configuration.proxyConfiguration copy] autorelease]);
config->setDeviceManagementRestrictionsEnabled(configuration.deviceManagementRestrictionsEnabled);
config->setAllLoadsBlockedByDeviceManagementRestrictionsForTesting(configuration.allLoadsBlockedByDeviceManagementRestrictionsForTesting);
@@ -366,12 +371,11 @@
- (NSUInteger)_perOriginStorageQuota
{
- return _websiteDataStore->websiteDataStore().perOriginStorageQuota();
+ return 0;
}
- (void)_setPerOriginStorageQuota:(NSUInteger)size
{
- _websiteDataStore->websiteDataStore().setPerOriginStorageQuota(size);
}
- (NSString *)_cacheStorageDirectory
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h (250149 => 250150)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h 2019-09-20 20:49:47 UTC (rev 250149)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h 2019-09-20 21:01:10 UTC (rev 250150)
@@ -48,15 +48,15 @@
@property (nonatomic, setter=_setResourceLoadStatisticsEnabled:) BOOL _resourceLoadStatisticsEnabled WK_API_AVAILABLE(macos(10.12), ios(10.0));
@property (nonatomic, setter=_setResourceLoadStatisticsDebugMode:) BOOL _resourceLoadStatisticsDebugMode WK_API_AVAILABLE(macos(10.14), ios(12.0));
-@property (nonatomic, setter=_setPerOriginStorageQuota:) NSUInteger _perOriginStorageQuota WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
-@property (nonatomic, setter=_setCacheStorageDirectory:) NSString* _cacheStorageDirectory WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
-@property (nonatomic, setter=_setServiceWorkerRegistrationDirectory:) NSString* _serviceWorkerRegistrationDirectory WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
+@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));
+@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));
+@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));
-@property (nonatomic, setter=_setBoundInterfaceIdentifier:) NSString *_boundInterfaceIdentifier WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
-@property (nonatomic, setter=_setAllowsCellularAccess:) BOOL _allowsCellularAccess WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
-@property (nonatomic, setter=_setProxyConfiguration:) NSDictionary *_proxyConfiguration WK_API_AVAILABLE(macos(10.14), ios(12.0));
-@property (nonatomic, copy, setter=_setSourceApplicationBundleIdentifier:) NSString *_sourceApplicationBundleIdentifier WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
-@property (nonatomic, copy, setter=_setSourceApplicationSecondaryIdentifier:) NSString *_sourceApplicationSecondaryIdentifier WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
+@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));
+@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));
+@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));
+@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));
+@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));
@property (nonatomic, setter=_setAllowsTLSFallback:) BOOL _allowsTLSFallback WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
@property (nonatomic, readonly) NSURL *_indexedDBDatabaseDirectory;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h (250149 => 250150)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h 2019-09-20 20:49:47 UTC (rev 250149)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h 2019-09-20 21:01:10 UTC (rev 250150)
@@ -43,6 +43,10 @@
@property (nonatomic, nullable, copy, setter=setHTTPProxy:) NSURL *httpProxy WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
@property (nonatomic, nullable, copy, setter=setHTTPSProxy:) NSURL *httpsProxy WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
@property (nonatomic) BOOL deviceManagementRestrictionsEnabled WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+@property (nonatomic) NSUInteger perOriginStorageQuota WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+@property (nonatomic, nullable, copy) NSString *boundInterfaceIdentifier WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+@property (nonatomic) BOOL allowsCellularAccess WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+@property (nonatomic, nullable, copy) NSDictionary *proxyConfiguration WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
// These properties only make sense for persistent data stores, and will throw
// an exception if set for non-persistent stores.
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm (250149 => 250150)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm 2019-09-20 20:49:47 UTC (rev 250149)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm 2019-09-20 21:01:10 UTC (rev 250150)
@@ -42,6 +42,7 @@
if (!self)
return nil;
+ API::Object::constructInWrapper<WebKit::WebsiteDataStoreConfiguration>(self);
_configuration->setPersistent(true);
return self;
@@ -53,11 +54,18 @@
if (!self)
return nil;
+ API::Object::constructInWrapper<WebKit::WebsiteDataStoreConfiguration>(self);
_configuration->setPersistent(false);
return self;
}
+- (void)dealloc
+{
+ _configuration->~WebsiteDataStoreConfiguration();
+ [super dealloc];
+}
+
- (BOOL)isPersistent
{
return _configuration->isPersistent();
@@ -284,6 +292,46 @@
_configuration->setDeviceManagementRestrictionsEnabled(enabled);
}
+- (NSUInteger)perOriginStorageQuota
+{
+ return _configuration->perOriginStorageQuota();
+}
+
+- (void)setPerOriginStorageQuota:(NSUInteger)quota
+{
+ _configuration->setPerOriginStorageQuota(quota);
+}
+
+- (NSString *)boundInterfaceIdentifier
+{
+ return _configuration->boundInterfaceIdentifier();
+}
+
+- (void)setBoundInterfaceIdentifier:(NSString *)identifier
+{
+ _configuration->setBoundInterfaceIdentifier(identifier);
+}
+
+- (BOOL)allowsCellularAccess
+{
+ return _configuration->allowsCellularAccess();
+}
+
+- (void)setAllowsCellularAccess:(BOOL)allows
+{
+ _configuration->setAllowsCellularAccess(allows);
+}
+
+- (NSDictionary *)proxyConfiguration
+{
+ return (__bridge NSDictionary *)_configuration->proxyConfiguration();
+}
+
+- (void)setProxyConfiguration:(NSDictionary *)configuration
+{
+ _configuration->setProxyConfiguration((__bridge CFDictionaryRef)[configuration copy]);
+}
+
- (BOOL)allLoadsBlockedByDeviceManagementRestrictionsForTesting
{
return _configuration->allLoadsBlockedByDeviceManagementRestrictionsForTesting();
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm (250149 => 250150)
--- trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2019-09-20 20:49:47 UTC (rev 250149)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2019-09-20 21:01:10 UTC (rev 250150)
@@ -119,11 +119,11 @@
WebsiteDataStoreParameters parameters;
parameters.networkSessionParameters = {
m_sessionID,
- m_boundInterfaceIdentifier,
- m_allowsCellularAccess,
- m_proxyConfiguration,
- m_sourceApplicationBundleIdentifier,
- m_sourceApplicationSecondaryIdentifier,
+ boundInterfaceIdentifier(),
+ allowsCellularAccess(),
+ proxyConfiguration(),
+ sourceApplicationBundleIdentifier(),
+ sourceApplicationSecondaryIdentifier(),
shouldLogCookieInformation,
Seconds { [defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey] / 1000. },
WTFMove(httpProxy),
@@ -154,8 +154,8 @@
}
parameters.uiProcessCookieStorageIdentifier = m_uiProcessCookieStorageIdentifier;
- parameters.networkSessionParameters.sourceApplicationBundleIdentifier = m_sourceApplicationBundleIdentifier;
- parameters.networkSessionParameters.sourceApplicationSecondaryIdentifier = m_sourceApplicationSecondaryIdentifier;
+ parameters.networkSessionParameters.sourceApplicationBundleIdentifier = sourceApplicationBundleIdentifier();
+ parameters.networkSessionParameters.sourceApplicationSecondaryIdentifier = sourceApplicationSecondaryIdentifier();
parameters.pendingCookies = copyToVector(m_pendingCookies);
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (250149 => 250150)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2019-09-20 20:49:47 UTC (rev 250149)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2019-09-20 21:01:10 UTC (rev 250150)
@@ -102,8 +102,6 @@
, m_configuration(m_resolvedConfiguration->copy())
, m_deviceIdHashSaltStorage(DeviceIdHashSaltStorage::create(isPersistent() ? m_configuration->deviceIdHashSaltsStorageDirectory() : String()))
, m_queue(WorkQueue::create("com.apple.WebKit.WebsiteDataStore"))
- , m_sourceApplicationBundleIdentifier(m_configuration->sourceApplicationBundleIdentifier())
- , m_sourceApplicationSecondaryIdentifier(m_configuration->sourceApplicationSecondaryIdentifier())
#if ENABLE(WEB_AUTHN)
, m_authenticatorManager(makeUniqueRef<AuthenticatorManager>())
#endif
@@ -2028,7 +2026,7 @@
{
if (m_networkingHasBegun)
return false;
- m_sourceApplicationSecondaryIdentifier = WTFMove(identifier);
+ m_resolvedConfiguration->setSourceApplicationSecondaryIdentifier(WTFMove(identifier));
return true;
}
@@ -2036,7 +2034,7 @@
{
if (m_networkingHasBegun)
return false;
- m_sourceApplicationBundleIdentifier = WTFMove(identifier);
+ m_resolvedConfiguration->setSourceApplicationBundleIdentifier(WTFMove(identifier));
return true;
}
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (250149 => 250150)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2019-09-20 20:49:47 UTC (rev 250149)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2019-09-20 21:01:10 UTC (rev 250150)
@@ -116,7 +116,6 @@
uint64_t perOriginStorageQuota() const { return m_resolvedConfiguration->perOriginStorageQuota(); }
uint64_t perThirdPartyOriginStorageQuota() const;
- void setPerOriginStorageQuota(uint64_t quota) { m_resolvedConfiguration->setPerOriginStorageQuota(quota); }
const String& cacheStorageDirectory() const { return m_resolvedConfiguration->cacheStorageDirectory(); }
void setCacheStorageDirectory(String&& directory) { m_resolvedConfiguration->setCacheStorageDirectory(WTFMove(directory)); }
const String& serviceWorkerRegistrationDirectory() const { return m_resolvedConfiguration->serviceWorkerRegistrationDirectory(); }
@@ -210,23 +209,23 @@
void removePendingCookie(const WebCore::Cookie&);
void clearPendingCookies();
- void setBoundInterfaceIdentifier(String&& identifier) { m_boundInterfaceIdentifier = WTFMove(identifier); }
- const String& boundInterfaceIdentifier() { return m_boundInterfaceIdentifier; }
+ void setBoundInterfaceIdentifier(String&& identifier) { m_resolvedConfiguration->setBoundInterfaceIdentifier(WTFMove(identifier)); }
+ const String& boundInterfaceIdentifier() { return m_resolvedConfiguration->boundInterfaceIdentifier(); }
- const String& sourceApplicationBundleIdentifier() const { return m_sourceApplicationBundleIdentifier; }
+ const String& sourceApplicationBundleIdentifier() const { return m_resolvedConfiguration->sourceApplicationBundleIdentifier(); }
bool setSourceApplicationBundleIdentifier(String&&);
- const String& sourceApplicationSecondaryIdentifier() const { return m_sourceApplicationSecondaryIdentifier; }
+ const String& sourceApplicationSecondaryIdentifier() const { return m_resolvedConfiguration->sourceApplicationSecondaryIdentifier(); }
bool setSourceApplicationSecondaryIdentifier(String&&);
void networkingHasBegun() { m_networkingHasBegun = true; }
- void setAllowsCellularAccess(AllowsCellularAccess allows) { m_allowsCellularAccess = allows; }
- AllowsCellularAccess allowsCellularAccess() { return m_allowsCellularAccess; }
+ void setAllowsCellularAccess(AllowsCellularAccess allows) { m_resolvedConfiguration->setAllowsCellularAccess(allows == AllowsCellularAccess::Yes); }
+ AllowsCellularAccess allowsCellularAccess() { return m_resolvedConfiguration->allowsCellularAccess() ? AllowsCellularAccess::Yes : AllowsCellularAccess::No; }
#if PLATFORM(COCOA)
- void setProxyConfiguration(CFDictionaryRef configuration) { m_proxyConfiguration = configuration; }
- CFDictionaryRef proxyConfiguration() { return m_proxyConfiguration.get(); }
+ void setProxyConfiguration(CFDictionaryRef configuration) { m_resolvedConfiguration->setProxyConfiguration(configuration); }
+ CFDictionaryRef proxyConfiguration() { return m_resolvedConfiguration->proxyConfiguration(); }
#endif
#if USE(CURL)
@@ -308,7 +307,6 @@
#if PLATFORM(COCOA)
Vector<uint8_t> m_uiProcessCookieStorageIdentifier;
RetainPtr<CFHTTPCookieStorageRef> m_cfCookieStorage;
- RetainPtr<CFDictionaryRef> m_proxyConfiguration;
#endif
#if USE(CURL)
@@ -319,10 +317,6 @@
WeakHashSet<WebProcessProxy> m_processes;
- String m_boundInterfaceIdentifier;
- AllowsCellularAccess m_allowsCellularAccess { AllowsCellularAccess::Yes };
- String m_sourceApplicationBundleIdentifier;
- String m_sourceApplicationSecondaryIdentifier;
bool m_networkingHasBegun { false };
#if HAVE(SEC_KEY_PROXY)
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp (250149 => 250150)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp 2019-09-20 20:49:47 UTC (rev 250149)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp 2019-09-20 21:01:10 UTC (rev 250150)
@@ -30,10 +30,7 @@
namespace WebKit {
-WebsiteDataStoreConfiguration::WebsiteDataStoreConfiguration()
- : m_resourceLoadStatisticsDirectory(API::WebsiteDataStore::defaultResourceLoadStatisticsDirectory())
-{
-}
+WebsiteDataStoreConfiguration::WebsiteDataStoreConfiguration() = default;
Ref<WebsiteDataStoreConfiguration> WebsiteDataStoreConfiguration::copy()
{
@@ -65,6 +62,12 @@
copy->m_httpsProxy = this->m_httpsProxy;
copy->m_deviceManagementRestrictionsEnabled = this->m_deviceManagementRestrictionsEnabled;
copy->m_allLoadsBlockedByDeviceManagementRestrictionsForTesting = this->m_allLoadsBlockedByDeviceManagementRestrictionsForTesting;
+ copy->m_boundInterfaceIdentifier = this->m_boundInterfaceIdentifier;
+ copy->m_allowsCellularAccess = this->m_allowsCellularAccess;
+#if PLATFORM(COCOA)
+ if (m_proxyConfiguration)
+ copy->m_proxyConfiguration = adoptCF(CFDictionaryCreateCopy(nullptr, this->m_proxyConfiguration.get()));
+#endif
return copy;
}
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h (250149 => 250150)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h 2019-09-20 20:49:47 UTC (rev 250149)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h 2019-09-20 21:01:10 UTC (rev 250150)
@@ -35,6 +35,7 @@
class WebsiteDataStoreConfiguration : public API::ObjectImpl<API::Object::Type::WebsiteDataStoreConfiguration> {
public:
static Ref<WebsiteDataStoreConfiguration> create() { return adoptRef(*new WebsiteDataStoreConfiguration); }
+ WebsiteDataStoreConfiguration();
Ref<WebsiteDataStoreConfiguration> copy();
@@ -68,6 +69,17 @@
const String& localStorageDirectory() const { return m_localStorageDirectory; }
void setLocalStorageDirectory(String&& directory) { m_localStorageDirectory = WTFMove(directory); }
+ const String& boundInterfaceIdentifier() const { return m_boundInterfaceIdentifier; }
+ void setBoundInterfaceIdentifier(String&& identifier) { m_boundInterfaceIdentifier = WTFMove(identifier); }
+
+ bool allowsCellularAccess() const { return m_allowsCellularAccess; }
+ void setAllowsCellularAccess(bool allows) { m_allowsCellularAccess = allows; }
+
+#if PLATFORM(COCOA)
+ CFDictionaryRef proxyConfiguration() const { return m_proxyConfiguration.get(); }
+ void setProxyConfiguration(CFDictionaryRef configuration) { m_proxyConfiguration = configuration; }
+#endif
+
const String& deviceIdHashSaltsStorageDirectory() const { return m_deviceIdHashSaltsStorageDirectory; }
void setDeviceIdHashSaltsStorageDirectory(String&& directory) { m_deviceIdHashSaltsStorageDirectory = WTFMove(directory); }
@@ -108,8 +120,6 @@
void setAllLoadsBlockedByDeviceManagementRestrictionsForTesting(bool blocked) { m_allLoadsBlockedByDeviceManagementRestrictionsForTesting = blocked; }
private:
- WebsiteDataStoreConfiguration();
-
bool m_isPersistent { false };
String m_cacheStorageDirectory;
@@ -132,10 +142,15 @@
String m_cookieStorageFile;
String m_sourceApplicationBundleIdentifier;
String m_sourceApplicationSecondaryIdentifier;
+ String m_boundInterfaceIdentifier;
URL m_httpProxy;
URL m_httpsProxy;
bool m_deviceManagementRestrictionsEnabled { false };
bool m_allLoadsBlockedByDeviceManagementRestrictionsForTesting { false };
+ bool m_allowsCellularAccess { true };
+#if PLATFORM(COCOA)
+ RetainPtr<CFDictionaryRef> m_proxyConfiguration;
+#endif
};
}
