Changeset 251675 in webkit

Timestamp:

Oct 28, 2019 2:52:07 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Remove unused WKWebsiteDataStore setter SPI
​https://bugs.webkit.org/show_bug.cgi?id=203114

Reviewed by Anders Carlsson.

They have been replaced by _WKWebsiteDataStoreConfiguration SPI which was adopted in rdar://problem/56349165

• UIProcess/API/Cocoa/WKWebsiteDataStore.mm:

(-[WKWebsiteDataStore _setBoundInterfaceIdentifier:]): Deleted.
(-[WKWebsiteDataStore _boundInterfaceIdentifier]): Deleted.
(-[WKWebsiteDataStore _setAllowsCellularAccess:]): Deleted.
(-[WKWebsiteDataStore _allowsCellularAccess]): Deleted.
(-[WKWebsiteDataStore _setProxyConfiguration:]): Deleted.
(-[WKWebsiteDataStore _proxyConfiguration]): Deleted.

• UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h:
• UIProcess/WebsiteData/WebsiteDataStore.h:

(WebKit::WebsiteDataStore::setBoundInterfaceIdentifier): Deleted.
(WebKit::WebsiteDataStore::setAllowsCellularAccess): Deleted.
(WebKit::WebsiteDataStore::setProxyConfiguration): Deleted.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebsiteDataStore.mm (modified) (2 diffs)
• UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataStore.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-10-28  Alex Christensen  <achristensen@webkit.org>
+
+        Remove unused WKWebsiteDataStore setter SPI
+        https://bugs.webkit.org/show_bug.cgi?id=203114
+
+        Reviewed by Anders Carlsson.
+
+        They have been replaced by _WKWebsiteDataStoreConfiguration SPI which was adopted in rdar://problem/56349165
+
+        * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+        (-[WKWebsiteDataStore _setBoundInterfaceIdentifier:]): Deleted.
+        (-[WKWebsiteDataStore _boundInterfaceIdentifier]): Deleted.
+        (-[WKWebsiteDataStore _setAllowsCellularAccess:]): Deleted.
+        (-[WKWebsiteDataStore _allowsCellularAccess]): Deleted.
+        (-[WKWebsiteDataStore _setProxyConfiguration:]): Deleted.
+        (-[WKWebsiteDataStore _proxyConfiguration]): Deleted.
+        * UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h:
+        * UIProcess/WebsiteData/WebsiteDataStore.h:
+        (WebKit::WebsiteDataStore::setBoundInterfaceIdentifier): Deleted.
+        (WebKit::WebsiteDataStore::setAllowsCellularAccess): Deleted.
+        (WebKit::WebsiteDataStore::setProxyConfiguration): Deleted.
+
 2019-10-28  Brady Eidson  <beidson@apple.com>
 

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

@@ -327 +327 @@
 }
 
-- (void)_setBoundInterfaceIdentifier:(NSString *)identifier
-{
-    _websiteDataStore->setBoundInterfaceIdentifier(identifier);
-}
-
-- (NSString *)_boundInterfaceIdentifier
-{
-    return _websiteDataStore->boundInterfaceIdentifier();
-}
-
-- (void)_setAllowsCellularAccess:(BOOL)allows
-{
-    _websiteDataStore->setAllowsCellularAccess(allows ? WebKit::AllowsCellularAccess::Yes : WebKit::AllowsCellularAccess::No);
-}
-
-- (BOOL)_allowsCellularAccess
-{
-    return _websiteDataStore->allowsCellularAccess() == WebKit::AllowsCellularAccess::Yes;
-}
-
-- (void)_setProxyConfiguration:(NSDictionary *)configuration
-{
-    _websiteDataStore->setProxyConfiguration((__bridge CFDictionaryRef)configuration);
-}
-
 - (NSString *)_sourceApplicationBundleIdentifier
 {
@@ -381 +356 @@
 {
     return NO;
-}
-
-- (NSDictionary *)_proxyConfiguration
-{
-    return (__bridge NSDictionary *)_websiteDataStore->proxyConfiguration();
 }
 

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

@@ -53 +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));
 
-@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));

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

@@ -223 +223 @@
     void clearPendingCookies();
 
-    void setBoundInterfaceIdentifier(String&& identifier) { m_resolvedConfiguration->setBoundInterfaceIdentifier(WTFMove(identifier)); }
     const String& boundInterfaceIdentifier() { return m_resolvedConfiguration->boundInterfaceIdentifier(); }
 
@@ -234 +233 @@
     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