Modified: trunk/Source/WebKit/ChangeLog (251686 => 251687)
--- trunk/Source/WebKit/ChangeLog 2019-10-28 23:56:14 UTC (rev 251686)
+++ trunk/Source/WebKit/ChangeLog 2019-10-29 00:09:41 UTC (rev 251687)
@@ -1,3 +1,15 @@
+2019-10-28 Alex Christensen <achristen...@webkit.org>
+
+ Unreviewed, rolling out r251675.
+
+ Broke some builds
+
+ Reverted changeset:
+
+ "Remove unused WKWebsiteDataStore setter SPI"
+ https://bugs.webkit.org/show_bug.cgi?id=203114
+ https://trac.webkit.org/changeset/251675
+
2019-10-28 Wenson Hsieh <wenson_hs...@apple.com>
Add bindings support for the enterkeyhint HTML attribute
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (251686 => 251687)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2019-10-28 23:56:14 UTC (rev 251686)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2019-10-29 00:09:41 UTC (rev 251687)
@@ -326,6 +326,31 @@
_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();
@@ -357,6 +382,11 @@
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 (251686 => 251687)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h 2019-10-28 23:56:14 UTC (rev 251686)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h 2019-10-29 00:09:41 UTC (rev 251687)
@@ -52,6 +52,9 @@
@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 (251686 => 251687)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2019-10-28 23:56:14 UTC (rev 251686)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2019-10-29 00:09:41 UTC (rev 251687)
@@ -222,6 +222,7 @@
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(); }
@@ -232,9 +233,11 @@
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
