Diff
Modified: trunk/Source/WebKit/ChangeLog (249670 => 249671)
--- trunk/Source/WebKit/ChangeLog 2019-09-09 22:38:40 UTC (rev 249670)
+++ trunk/Source/WebKit/ChangeLog 2019-09-09 22:45:45 UTC (rev 249671)
@@ -1,3 +1,24 @@
+2019-09-09 Alex Christensen <[email protected]>
+
+ Deprecate unused SPI to preconnect to a server
+ https://bugs.webkit.org/show_bug.cgi?id=201558
+
+ Reviewed by Youenn Fablet.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::preconnectTo): Deleted.
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in:
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextPreconnectToServer):
+ * UIProcess/API/C/WKContextPrivate.h:
+ * UIProcess/API/Cocoa/WKProcessPool.mm:
+ (-[WKProcessPool _preconnectToServer:]):
+ * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::preconnectToServer): Deleted.
+ * UIProcess/WebProcessPool.h:
+
2019-09-09 Per Arne Vollan <[email protected]>
Unreviewed Windows build fix.
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (249670 => 249671)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-09-09 22:38:40 UTC (rev 249670)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-09-09 22:45:45 UTC (rev 249671)
@@ -2223,21 +2223,6 @@
callback(String { cacheStorageDirectory });
}
-void NetworkProcess::preconnectTo(const URL& url, WebCore::StoredCredentialsPolicy storedCredentialsPolicy)
-{
-#if ENABLE(SERVER_PRECONNECT)
- NetworkLoadParameters parameters { PAL::SessionID::defaultSessionID() };
- parameters.request = ResourceRequest { url };
- parameters.storedCredentialsPolicy = storedCredentialsPolicy;
- parameters.shouldPreconnectOnly = PreconnectOnly::Yes;
-
- new PreconnectTask(*this, WTFMove(parameters));
-#else
- UNUSED_PARAM(url);
- UNUSED_PARAM(storedCredentialsPolicy);
-#endif
-}
-
void NetworkProcess::registerURLSchemeAsSecure(const String& scheme) const
{
SchemeRegistry::registerURLSchemeAsSecure(scheme);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (249670 => 249671)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-09-09 22:38:40 UTC (rev 249670)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-09-09 22:45:45 UTC (rev 249671)
@@ -269,8 +269,6 @@
using CacheStorageRootPathCallback = CompletionHandler<void(String&&)>;
void cacheStorageRootPath(PAL::SessionID, CacheStorageRootPathCallback&&);
- void preconnectTo(const URL&, WebCore::StoredCredentialsPolicy);
-
void setSessionIsControlledByAutomation(PAL::SessionID, bool);
bool sessionIsControlledByAutomation(PAL::SessionID) const;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in (249670 => 249671)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2019-09-09 22:38:40 UTC (rev 249670)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2019-09-09 22:45:45 UTC (rev 249671)
@@ -83,8 +83,6 @@
CancelPrepareToSuspend()
ProcessDidResume()
- PreconnectTo(URL url, enum:uint8_t WebCore::StoredCredentialsPolicy storedCredentialsPolicy);
-
#if ENABLE(RESOURCE_LOAD_STATISTICS)
ClearPrevalentResource(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () Async
ClearUserInteraction(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () Async
Modified: trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp (249670 => 249671)
--- trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp 2019-09-09 22:38:40 UTC (rev 249670)
+++ trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp 2019-09-09 22:45:45 UTC (rev 249671)
@@ -433,9 +433,8 @@
WebKit::toImpl(contextRef)->configuration().setDiskCacheSpeculativeValidationEnabled(value);
}
-void WKContextPreconnectToServer(WKContextRef contextRef, WKURLRef serverURLRef)
+void WKContextPreconnectToServer(WKContextRef, WKURLRef)
{
- WebKit::toImpl(contextRef)->preconnectToServer(URL(URL(), WebKit::toWTFString(serverURLRef)));
}
WKCookieManagerRef WKContextGetCookieManager(WKContextRef contextRef)
Modified: trunk/Source/WebKit/UIProcess/API/C/WKContextPrivate.h (249670 => 249671)
--- trunk/Source/WebKit/UIProcess/API/C/WKContextPrivate.h 2019-09-09 22:38:40 UTC (rev 249670)
+++ trunk/Source/WebKit/UIProcess/API/C/WKContextPrivate.h 2019-09-09 22:45:45 UTC (rev 249671)
@@ -109,7 +109,7 @@
WK_EXPORT void WKContextSetFontWhitelist(WKContextRef, WKArrayRef);
-WK_EXPORT void WKContextPreconnectToServer(WKContextRef context, WKURLRef serverURL);
+WK_EXPORT void WKContextPreconnectToServer(WKContextRef context, WKURLRef serverURL) WK_C_API_DEPRECATED;
WK_EXPORT WKProcessID WKContextGetNetworkProcessIdentifier(WKContextRef context);
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm (249670 => 249671)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm 2019-09-09 22:38:40 UTC (rev 249670)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm 2019-09-09 22:45:45 UTC (rev 249671)
@@ -528,7 +528,6 @@
- (void)_preconnectToServer:(NSURL *)serverURL
{
- _processPool->preconnectToServer(serverURL);
}
- (size_t)_pluginProcessCount
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (249670 => 249671)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2019-09-09 22:38:40 UTC (rev 249670)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2019-09-09 22:45:45 UTC (rev 249671)
@@ -115,7 +115,7 @@
// Test only. Should be called before any web content processes are launched.
+ (void)_forceGameControllerFramework WK_API_AVAILABLE(macos(10.13), ios(11.0));
-- (void)_preconnectToServer:(NSURL *)serverURL WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
+- (void)_preconnectToServer:(NSURL *)serverURL WK_API_DEPRECATED("If needed, SPI should be added to WKWebsiteDataStore", macos(10.13.4, WK_MAC_TBA), ios(11.3, WK_IOS_TBA));
// Test only.
- (void)_setAllowsAnySSLCertificateForServiceWorker:(BOOL)allows WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (249670 => 249671)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-09-09 22:38:40 UTC (rev 249670)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-09-09 22:45:45 UTC (rev 249671)
@@ -1523,14 +1523,6 @@
}
}
-void WebProcessPool::preconnectToServer(const URL& url)
-{
- if (!url.isValid() || !url.protocolIsInHTTPFamily())
- return;
-
- ensureNetworkProcess().send(Messages::NetworkProcess::PreconnectTo(url, StoredCredentialsPolicy::Use), 0);
-}
-
void WebProcessPool::registerURLSchemeAsLocal(const String& urlScheme)
{
m_schemesToRegisterAsLocal.add(urlScheme);
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.h (249670 => 249671)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.h 2019-09-09 22:38:40 UTC (rev 249670)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.h 2019-09-09 22:45:45 UTC (rev 249671)
@@ -268,8 +268,6 @@
void registerURLSchemeServiceWorkersCanHandle(const String&);
void registerURLSchemeAsCanDisplayOnlyIfCanRequest(const String&);
- void preconnectToServer(const URL&);
-
VisitedLinkStore& visitedLinkStore() { return m_visitedLinkStore.get(); }
void setCacheModel(CacheModel);
