Title: [257538] trunk/Source/WebKit
- Revision
- 257538
- Author
- [email protected]
- Date
- 2020-02-26 17:15:35 -0800 (Wed, 26 Feb 2020)
Log Message
Remove WebsiteDataStore setters for allowsCellularAccess, proxyConfiguration, and boundInterfaceIdentifier
https://bugs.webkit.org/show_bug.cgi?id=206390
Reviewed by Chris Dumez.
The WKWebsiteDataStore SPI was deprecated with replacement on _WKWebsiteDataStoreConfiguration,
and the replacements were adopted in rdar://problem/58359766
* UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
(-[WKWebsiteDataStore _setBoundInterfaceIdentifier:]):
(-[WKWebsiteDataStore _boundInterfaceIdentifier]):
(-[WKWebsiteDataStore _setAllowsCellularAccess:]):
(-[WKWebsiteDataStore _allowsCellularAccess]):
(-[WKWebsiteDataStore _setProxyConfiguration:]):
(-[WKWebsiteDataStore _proxyConfiguration]):
* UIProcess/Cocoa/WebPageProxyCocoa.mm:
(WebKit::WebPageProxy::paymentCoordinatorBoundInterfaceIdentifier):
* UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
(WebKit::WebsiteDataStore::parameters):
* UIProcess/WebsiteData/WebsiteDataStore.h:
(WebKit::WebsiteDataStore::networkingHasBegun):
(WebKit::WebsiteDataStore::setBoundInterfaceIdentifier): Deleted.
(WebKit::WebsiteDataStore::boundInterfaceIdentifier): Deleted.
(WebKit::WebsiteDataStore::setAllowsCellularAccess): Deleted.
(WebKit::WebsiteDataStore::allowsCellularAccess): Deleted.
(WebKit::WebsiteDataStore::setProxyConfiguration): Deleted.
(WebKit::WebsiteDataStore::proxyConfiguration): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (257537 => 257538)
--- trunk/Source/WebKit/ChangeLog 2020-02-27 01:08:46 UTC (rev 257537)
+++ trunk/Source/WebKit/ChangeLog 2020-02-27 01:15:35 UTC (rev 257538)
@@ -1,3 +1,33 @@
+2020-02-26 Alex Christensen <[email protected]>
+
+ Remove WebsiteDataStore setters for allowsCellularAccess, proxyConfiguration, and boundInterfaceIdentifier
+ https://bugs.webkit.org/show_bug.cgi?id=206390
+
+ Reviewed by Chris Dumez.
+
+ The WKWebsiteDataStore SPI was deprecated with replacement on _WKWebsiteDataStoreConfiguration,
+ and the replacements were adopted in rdar://problem/58359766
+
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+ (-[WKWebsiteDataStore _setBoundInterfaceIdentifier:]):
+ (-[WKWebsiteDataStore _boundInterfaceIdentifier]):
+ (-[WKWebsiteDataStore _setAllowsCellularAccess:]):
+ (-[WKWebsiteDataStore _allowsCellularAccess]):
+ (-[WKWebsiteDataStore _setProxyConfiguration:]):
+ (-[WKWebsiteDataStore _proxyConfiguration]):
+ * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+ (WebKit::WebPageProxy::paymentCoordinatorBoundInterfaceIdentifier):
+ * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
+ (WebKit::WebsiteDataStore::parameters):
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+ (WebKit::WebsiteDataStore::networkingHasBegun):
+ (WebKit::WebsiteDataStore::setBoundInterfaceIdentifier): Deleted.
+ (WebKit::WebsiteDataStore::boundInterfaceIdentifier): Deleted.
+ (WebKit::WebsiteDataStore::setAllowsCellularAccess): Deleted.
+ (WebKit::WebsiteDataStore::allowsCellularAccess): Deleted.
+ (WebKit::WebsiteDataStore::setProxyConfiguration): Deleted.
+ (WebKit::WebsiteDataStore::proxyConfiguration): Deleted.
+
2020-02-26 Fujii Hironori <[email protected]>
Unreviewed unified source builds fix.
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (257537 => 257538)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2020-02-27 01:08:46 UTC (rev 257537)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2020-02-27 01:15:35 UTC (rev 257538)
@@ -321,27 +321,24 @@
- (void)_setBoundInterfaceIdentifier:(NSString *)identifier
{
- _websiteDataStore->setBoundInterfaceIdentifier(identifier);
}
- (NSString *)_boundInterfaceIdentifier
{
- return _websiteDataStore->boundInterfaceIdentifier();
+ return nil;
}
- (void)_setAllowsCellularAccess:(BOOL)allows
{
- _websiteDataStore->setAllowsCellularAccess(allows ? WebKit::AllowsCellularAccess::Yes : WebKit::AllowsCellularAccess::No);
}
- (BOOL)_allowsCellularAccess
{
- return _websiteDataStore->allowsCellularAccess() == WebKit::AllowsCellularAccess::Yes;
+ return YES;
}
- (void)_setProxyConfiguration:(NSDictionary *)configuration
{
- _websiteDataStore->setProxyConfiguration((__bridge CFDictionaryRef)configuration);
}
- (NSString *)_sourceApplicationBundleIdentifier
@@ -377,7 +374,7 @@
- (NSDictionary *)_proxyConfiguration
{
- return (__bridge NSDictionary *)_websiteDataStore->proxyConfiguration();
+ return nil;
}
- (NSURL *)_indexedDBDatabaseDirectory
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm (257537 => 257538)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm 2020-02-27 01:08:46 UTC (rev 257537)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm 2020-02-27 01:15:35 UTC (rev 257538)
@@ -235,7 +235,7 @@
const String& WebPageProxy::paymentCoordinatorBoundInterfaceIdentifier(const WebPaymentCoordinatorProxy&)
{
- return websiteDataStore().boundInterfaceIdentifier();
+ return websiteDataStore().configuration().boundInterfaceIdentifier();
}
const String& WebPageProxy::paymentCoordinatorSourceApplicationBundleIdentifier(const WebPaymentCoordinatorProxy&)
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm (257537 => 257538)
--- trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2020-02-27 01:08:46 UTC (rev 257537)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2020-02-27 01:15:35 UTC (rev 257538)
@@ -150,9 +150,9 @@
WebsiteDataStoreParameters parameters;
parameters.networkSessionParameters = {
m_sessionID,
- boundInterfaceIdentifier(),
- allowsCellularAccess(),
- proxyConfiguration(),
+ configuration().boundInterfaceIdentifier(),
+ configuration().allowsCellularAccess() ? AllowsCellularAccess::Yes : AllowsCellularAccess::No,
+ configuration().proxyConfiguration(),
sourceApplicationBundleIdentifier(),
sourceApplicationSecondaryIdentifier(),
shouldLogCookieInformation,
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (257537 => 257538)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2020-02-27 01:08:46 UTC (rev 257537)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2020-02-27 01:15:35 UTC (rev 257538)
@@ -224,9 +224,6 @@
void removePendingCookie(const WebCore::Cookie&);
void clearPendingCookies();
- void setBoundInterfaceIdentifier(String&& identifier) { m_resolvedConfiguration->setBoundInterfaceIdentifier(WTFMove(identifier)); }
- const String& boundInterfaceIdentifier() { return m_resolvedConfiguration->boundInterfaceIdentifier(); }
-
const String& sourceApplicationBundleIdentifier() const { return m_resolvedConfiguration->sourceApplicationBundleIdentifier(); }
bool setSourceApplicationBundleIdentifier(String&&);
@@ -234,15 +231,7 @@
bool setSourceApplicationSecondaryIdentifier(String&&);
void networkingHasBegun() { m_networkingHasBegun = true; }
-
- 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_resolvedConfiguration->setProxyConfiguration(configuration); }
- CFDictionaryRef proxyConfiguration() { return m_resolvedConfiguration->proxyConfiguration(); }
-#endif
-
#if USE(CURL)
void setNetworkProxySettings(WebCore::CurlProxySettings&&);
const WebCore::CurlProxySettings& networkProxySettings() const { return m_proxySettings; }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
