Changeset 250457 in webkit

Timestamp:

Sep 27, 2019 1:55:59 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Move legacy custom protocol registration from process pool to NetworkProcessProxy
​https://bugs.webkit.org/show_bug.cgi?id=202315

Reviewed by Tim Horton.

Legacy custom protocol registration is a global thing, which is why it's legacy and we're trying to get rid of it.
In the meantime, we don't want it to be in the set of things the NetworkProcess depends on the WebProcessPool for, which should be an empty set.

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::ensureNetworkProcess):
(WebKit::WebProcessPool::registerGlobalURLSchemeAsHavingCustomProtocolHandlers):
(WebKit::WebProcessPool::unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers):
(WebKit::WebProcessPool::registerSchemeForCustomProtocol): Deleted.
(WebKit::WebProcessPool::unregisterSchemeForCustomProtocol): Deleted.

• UIProcess/WebProcessPool.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/glib/WebKitWebContext.cpp (modified) (1 diff)
• UIProcess/Network/NetworkProcessProxy.cpp (modified) (2 diffs)
• UIProcess/Network/NetworkProcessProxy.h (modified) (1 diff)
• UIProcess/WebProcessPool.cpp (modified) (5 diffs)
• UIProcess/WebProcessPool.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-27  Alex Christensen  <achristensen@webkit.org>
+
+        Move legacy custom protocol registration from process pool to NetworkProcessProxy
+        https://bugs.webkit.org/show_bug.cgi?id=202315
+
+        Reviewed by Tim Horton.
+
+        Legacy custom protocol registration is a global thing, which is why it's legacy and we're trying to get rid of it.
+        In the meantime, we don't want it to be in the set of things the NetworkProcess depends on the WebProcessPool for, which should be an empty set.
+
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::ensureNetworkProcess):
+        (WebKit::WebProcessPool::registerGlobalURLSchemeAsHavingCustomProtocolHandlers):
+        (WebKit::WebProcessPool::unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers):
+        (WebKit::WebProcessPool::registerSchemeForCustomProtocol): Deleted.
+        (WebKit::WebProcessPool::unregisterSchemeForCustomProtocol): Deleted.
+        * UIProcess/WebProcessPool.h:
+
 2019-09-27  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp

@@ -1139 +1139 @@
     auto addResult = context->priv->uriSchemeHandlers.set(String::fromUTF8(scheme), handler.get());
     if (addResult.isNewEntry)
-        context->priv->processPool->registerSchemeForCustomProtocol(String::fromUTF8(scheme));
+        WebKit::WebProcessPool::registerGlobalURLSchemeAsHavingCustomProtocolHandlers(String::fromUTF8(scheme));
 }
 

trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp

@@ -32 +32 @@
 #include "DownloadProxyMessages.h"
 #if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
+#include "LegacyCustomProtocolManagerMessages.h"
 #include "LegacyCustomProtocolManagerProxyMessages.h"
 #endif
@@ -1258 +1259 @@
 }
 
+void NetworkProcessProxy::registerSchemeForLegacyCustomProtocol(const String& scheme)
+{
+#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
+    send(Messages::LegacyCustomProtocolManager::RegisterScheme(scheme), 0);
+#else
+    UNUSED_PARAM(scheme);
+#endif
+}
+
+void NetworkProcessProxy::unregisterSchemeForLegacyCustomProtocol(const String& scheme)
+{
+#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
+    send(Messages::LegacyCustomProtocolManager::UnregisterScheme(scheme), 0);
+#else
+    UNUSED_PARAM(scheme);
+#endif
+}
+
 void NetworkProcessProxy::takeUploadAssertion()
 {

trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h

@@ -192 +192 @@
     void sendProcessWillSuspendImminentlyForTesting();
 
+    void registerSchemeForLegacyCustomProtocol(const String&);
+    void unregisterSchemeForLegacyCustomProtocol(const String&);
+
 private:
     // AuxiliaryProcessProxy

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -103 +103 @@
 #include <wtf/text/StringConcatenateNumbers.h>
 
-#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
-#include "LegacyCustomProtocolManagerMessages.h"
-#endif
-
 #if ENABLE(SERVICE_CONTROLS)
 #include "ServicesController.h"
@@ -494 +490 @@
 
     for (auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
-        parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
-
-    for (auto& scheme : m_urlSchemesRegisteredForCustomProtocols)
         parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
 
@@ -1518 +1511 @@
 
     globalURLSchemesWithCustomProtocolHandlers().add(urlScheme);
-    for (auto* processPool : allProcessPools())
-        processPool->registerSchemeForCustomProtocol(urlScheme);
+    for (auto* processPool : allProcessPools()) {
+        if (auto* networkProcess = processPool->networkProcess())
+            networkProcess->registerSchemeForLegacyCustomProtocol(urlScheme);
+    }
 }
 
@@ -1528 +1523 @@
 
     globalURLSchemesWithCustomProtocolHandlers().remove(urlScheme);
-    for (auto* processPool : allProcessPools())
-        processPool->unregisterSchemeForCustomProtocol(urlScheme);
+    for (auto* processPool : allProcessPools()) {
+        if (auto* networkProcess = processPool->networkProcess())
+            networkProcess->unregisterSchemeForLegacyCustomProtocol(urlScheme);
+    }
 }
 
@@ -1969 +1966 @@
 {
     m_plugInAutoStartProvider.setAutoStartOriginsFilteringOutEntriesAddedAfterTime(dictionary, time);
-}
-
-void WebProcessPool::registerSchemeForCustomProtocol(const String& scheme)
-{
-#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
-    if (!globalURLSchemesWithCustomProtocolHandlers().contains(scheme))
-        m_urlSchemesRegisteredForCustomProtocols.add(scheme);
-    sendToNetworkingProcess(Messages::LegacyCustomProtocolManager::RegisterScheme(scheme));
-#endif
-}
-
-void WebProcessPool::unregisterSchemeForCustomProtocol(const String& scheme)
-{
-#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
-    m_urlSchemesRegisteredForCustomProtocols.remove(scheme);
-    sendToNetworkingProcess(Messages::LegacyCustomProtocolManager::UnregisterScheme(scheme));
-#endif
 }
 

trunk/Source/WebKit/UIProcess/WebProcessPool.h

@@ -411 +411 @@
     void resetHSTSHostsAddedAfterDate(double startDateIntervalSince1970);
 
-    void registerSchemeForCustomProtocol(const String&);
-    void unregisterSchemeForCustomProtocol(const String&);
-
     static void registerGlobalURLSchemeAsHavingCustomProtocolHandlers(const String&);
     static void unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers(const String&);
@@ -678 +675 @@
     WebCore::SoupNetworkProxySettings m_networkProxySettings;
 #endif
-    HashSet<String, ASCIICaseInsensitiveHash> m_urlSchemesRegisteredForCustomProtocols;
 
 #if PLATFORM(MAC)