Modified: trunk/Source/WebKit/ChangeLog (251674 => 251675)
--- trunk/Source/WebKit/ChangeLog 2019-10-28 21:46:29 UTC (rev 251674)
+++ trunk/Source/WebKit/ChangeLog 2019-10-28 21:52:07 UTC (rev 251675)
@@ -1,3 +1,25 @@
+2019-10-28 Alex Christensen <achristen...@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 <beid...@apple.com>
Expose _printOperationWithPrintInfo: SPI as API
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (251674 => 251675)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2019-10-28 21:46:29 UTC (rev 251674)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2019-10-28 21:52:07 UTC (rev 251675)
@@ -326,31 +326,6 @@
_websiteDataStore->setServiceWorkerRegistrationDirectory(directory);
}
-- (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
{
return _websiteDataStore->sourceApplicationBundleIdentifier();
@@ -382,11 +357,6 @@
return NO;
}
-- (NSDictionary *)_proxyConfiguration
-{
- return (__bridge NSDictionary *)_websiteDataStore->proxyConfiguration();
-}
-
- (NSURL *)_indexedDBDatabaseDirectory
{
return [NSURL fileURLWithPath:_websiteDataStore->configuration().indexedDBDatabaseDirectory() isDirectory:YES];
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h (251674 => 251675)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h 2019-10-28 21:46:29 UTC (rev 251674)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h 2019-10-28 21:52:07 UTC (rev 251675)
@@ -52,9 +52,6 @@
@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_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));
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (251674 => 251675)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2019-10-28 21:46:29 UTC (rev 251674)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2019-10-28 21:52:07 UTC (rev 251675)
@@ -222,7 +222,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(); }
@@ -233,11 +232,9 @@
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
