Diff
Modified: trunk/Source/WebKit/ChangeLog (257552 => 257553)
--- trunk/Source/WebKit/ChangeLog 2020-02-27 04:35:24 UTC (rev 257552)
+++ trunk/Source/WebKit/ChangeLog 2020-02-27 04:43:32 UTC (rev 257553)
@@ -1,5 +1,22 @@
2020-02-26 Alex Christensen <[email protected]>
+ Remove unused WebsiteDataStore::setSourceApplicationBundleIdentifier
+ https://bugs.webkit.org/show_bug.cgi?id=206456
+
+ Reviewed by Brady Eidson.
+
+ The replacement on WebsiteDataStoreConfiguration has been adopted.
+
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+ (-[WKWebsiteDataStore _sourceApplicationBundleIdentifier]):
+ (-[WKWebsiteDataStore _setSourceApplicationBundleIdentifier:]):
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::setSourceApplicationBundleIdentifier): Deleted.
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+ (WebKit::WebsiteDataStore::sourceApplicationBundleIdentifier const):
+
+2020-02-26 Alex Christensen <[email protected]>
+
_WKUserContentWorld should be a wrapper around WKContentWorld
https://bugs.webkit.org/show_bug.cgi?id=208274
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (257552 => 257553)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2020-02-27 04:35:24 UTC (rev 257552)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2020-02-27 04:43:32 UTC (rev 257553)
@@ -341,26 +341,6 @@
{
}
-- (NSString *)_sourceApplicationBundleIdentifier
-{
- return _websiteDataStore->sourceApplicationBundleIdentifier();
-}
-
-- (void)_setSourceApplicationBundleIdentifier:(NSString *)identifier
-{
- if (!_websiteDataStore->setSourceApplicationBundleIdentifier(identifier))
- [NSException raise:NSGenericException format:@"_setSourceApplicationBundleIdentifier cannot be called after networking has begun"];
-}
-
-- (NSString *)_sourceApplicationSecondaryIdentifier
-{
- return nil;
-}
-
-- (void)_setSourceApplicationSecondaryIdentifier:(NSString *)identifier
-{
-}
-
- (void)_setAllowsTLSFallback:(BOOL)allows
{
}
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h (257552 => 257553)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h 2020-02-27 04:35:24 UTC (rev 257552)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h 2020-02-27 04:43:32 UTC (rev 257553)
@@ -55,8 +55,6 @@
@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(10.15), ios(13.0));
@property (nonatomic, readonly) NSURL *_indexedDBDatabaseDirectory;
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm (257552 => 257553)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm 2020-02-27 04:35:24 UTC (rev 257552)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm 2020-02-27 04:43:32 UTC (rev 257553)
@@ -240,12 +240,12 @@
const String& WebPageProxy::paymentCoordinatorSourceApplicationBundleIdentifier(const WebPaymentCoordinatorProxy&)
{
- return websiteDataStore().sourceApplicationBundleIdentifier();
+ return websiteDataStore().configuration().sourceApplicationBundleIdentifier();
}
const String& WebPageProxy::paymentCoordinatorSourceApplicationSecondaryIdentifier(const WebPaymentCoordinatorProxy&)
{
- return websiteDataStore().sourceApplicationSecondaryIdentifier();
+ return websiteDataStore().configuration().sourceApplicationSecondaryIdentifier();
}
void WebPageProxy::paymentCoordinatorAddMessageReceiver(WebPaymentCoordinatorProxy&, const IPC::StringReference& messageReceiverName, IPC::MessageReceiver& messageReceiver)
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (257552 => 257553)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2020-02-27 04:35:24 UTC (rev 257552)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2020-02-27 04:43:32 UTC (rev 257553)
@@ -496,10 +496,9 @@
parameters.defaultDataStoreParameters.pendingCookies = copyToVector(m_websiteDataStore->pendingCookies());
m_websiteDataStore->clearPendingCookies();
#if PLATFORM(COCOA)
- parameters.defaultDataStoreParameters.networkSessionParameters.sourceApplicationBundleIdentifier = m_websiteDataStore->sourceApplicationBundleIdentifier();
- parameters.defaultDataStoreParameters.networkSessionParameters.sourceApplicationSecondaryIdentifier = m_websiteDataStore->sourceApplicationSecondaryIdentifier();
+ parameters.defaultDataStoreParameters.networkSessionParameters.sourceApplicationBundleIdentifier = m_websiteDataStore->configuration().sourceApplicationBundleIdentifier();
+ parameters.defaultDataStoreParameters.networkSessionParameters.sourceApplicationSecondaryIdentifier = m_websiteDataStore->configuration().sourceApplicationSecondaryIdentifier();
#endif
- m_websiteDataStore->networkingHasBegun();
}
parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel();
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm (257552 => 257553)
--- trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2020-02-27 04:35:24 UTC (rev 257552)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2020-02-27 04:43:32 UTC (rev 257553)
@@ -153,8 +153,8 @@
configuration().boundInterfaceIdentifier(),
configuration().allowsCellularAccess() ? AllowsCellularAccess::Yes : AllowsCellularAccess::No,
configuration().proxyConfiguration(),
- sourceApplicationBundleIdentifier(),
- sourceApplicationSecondaryIdentifier(),
+ configuration().sourceApplicationBundleIdentifier(),
+ configuration().sourceApplicationSecondaryIdentifier(),
shouldLogCookieInformation,
Seconds { [defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey] / 1000. },
WTFMove(httpProxy),
@@ -182,7 +182,6 @@
m_configuration->allowsServerPreconnect(),
isInAppBrowserPrivacyEnabled
};
- networkingHasBegun();
auto cookieFile = resolvedCookieStorageFile();
@@ -194,8 +193,8 @@
}
parameters.uiProcessCookieStorageIdentifier = m_uiProcessCookieStorageIdentifier;
- parameters.networkSessionParameters.sourceApplicationBundleIdentifier = sourceApplicationBundleIdentifier();
- parameters.networkSessionParameters.sourceApplicationSecondaryIdentifier = sourceApplicationSecondaryIdentifier();
+ parameters.networkSessionParameters.sourceApplicationBundleIdentifier = configuration().sourceApplicationBundleIdentifier();
+ parameters.networkSessionParameters.sourceApplicationSecondaryIdentifier = configuration().sourceApplicationSecondaryIdentifier();
parameters.pendingCookies = copyToVector(m_pendingCookies);
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (257552 => 257553)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2020-02-27 04:35:24 UTC (rev 257552)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2020-02-27 04:43:32 UTC (rev 257553)
@@ -2190,14 +2190,6 @@
{
}
-bool WebsiteDataStore::setSourceApplicationBundleIdentifier(String&& identifier)
-{
- if (m_networkingHasBegun)
- return false;
- m_resolvedConfiguration->setSourceApplicationBundleIdentifier(WTFMove(identifier));
- return true;
-}
-
void WebsiteDataStore::getLocalStorageDetails(Function<void(Vector<LocalStorageDatabaseTracker::OriginDetails>&&)>&& completionHandler)
{
if (!isPersistent()) {
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (257552 => 257553)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2020-02-27 04:35:24 UTC (rev 257552)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2020-02-27 04:43:32 UTC (rev 257553)
@@ -224,13 +224,6 @@
void removePendingCookie(const WebCore::Cookie&);
void clearPendingCookies();
- const String& sourceApplicationBundleIdentifier() const { return m_resolvedConfiguration->sourceApplicationBundleIdentifier(); }
- bool setSourceApplicationBundleIdentifier(String&&);
-
- const String& sourceApplicationSecondaryIdentifier() const { return m_resolvedConfiguration->sourceApplicationSecondaryIdentifier(); }
-
- void networkingHasBegun() { m_networkingHasBegun = true; }
-
#if USE(CURL)
void setNetworkProxySettings(WebCore::CurlProxySettings&&);
const WebCore::CurlProxySettings& networkProxySettings() const { return m_proxySettings; }
@@ -343,8 +336,6 @@
WeakHashSet<WebProcessProxy> m_processes;
- bool m_networkingHasBegun { false };
-
#if HAVE(SEC_KEY_PROXY)
Vector<Ref<SecKeyProxyStore>> m_secKeyProxyStores;
#endif
Modified: trunk/Tools/ChangeLog (257552 => 257553)
--- trunk/Tools/ChangeLog 2020-02-27 04:35:24 UTC (rev 257552)
+++ trunk/Tools/ChangeLog 2020-02-27 04:43:32 UTC (rev 257553)
@@ -1,5 +1,15 @@
2020-02-26 Alex Christensen <[email protected]>
+ Remove unused WebsiteDataStore::setSourceApplicationBundleIdentifier
+ https://bugs.webkit.org/show_bug.cgi?id=206456
+
+ Reviewed by Brady Eidson.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm:
+ (TEST):
+
+2020-02-26 Alex Christensen <[email protected]>
+
_WKUserContentWorld should be a wrapper around WKContentWorld
https://bugs.webkit.org/show_bug.cgi?id=208274
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm (257552 => 257553)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm 2020-02-27 04:35:24 UTC (rev 257552)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm 2020-02-27 04:43:32 UTC (rev 257553)
@@ -501,31 +501,6 @@
[webView _test_waitForDidFinishNavigation];
}
-TEST(WebKit, ApplicationIdentifiers)
-{
- auto websiteDataStoreConfiguration = adoptNS([[_WKWebsiteDataStoreConfiguration alloc] init]);
- [websiteDataStoreConfiguration setSourceApplicationBundleIdentifier:@"testidentifier"];
-
- auto webViewConfiguration = adoptNS([[WKWebViewConfiguration alloc] init]);
- auto websiteDataStore = [[[WKWebsiteDataStore alloc] _initWithConfiguration:websiteDataStoreConfiguration.get()] autorelease];
- EXPECT_TRUE([websiteDataStore._sourceApplicationBundleIdentifier isEqualToString:@"testidentifier"]);
- [websiteDataStore _setSourceApplicationBundleIdentifier:@"otheridentifier"];
-
- [webViewConfiguration setWebsiteDataStore:websiteDataStore];
- auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:webViewConfiguration.get()]);
- [webView synchronouslyLoadTestPageNamed:@"simple"];
-
- RetainPtr<NSException> exception;
- @try {
- [websiteDataStore _setSourceApplicationBundleIdentifier:@"settingShouldFailNow"];
- } @catch(NSException *caught) {
- exception = caught;
- }
- EXPECT_TRUE([[exception reason] isEqualToString:@"_setSourceApplicationBundleIdentifier cannot be called after networking has begun"]);
- EXPECT_TRUE([websiteDataStore._sourceApplicationBundleIdentifier isEqualToString:@"otheridentifier"]);
- EXPECT_TRUE([[websiteDataStoreConfiguration sourceApplicationBundleIdentifier] isEqualToString:@"testidentifier"]);
-}
-
TEST(WebKit, WebsiteDataStoreConfigurationPathNull)
{
EXPECT_TRUE([[[[_WKWebsiteDataStoreConfiguration alloc] init] autorelease] _indexedDBDatabaseDirectory]);
