Changeset 250739 in webkit

Timestamp:

Oct 4, 2019, 12:33:00 PM (6 years ago)

Author:

achristensen@apple.com

Message:

Stop sending list of display-isolated schemes to NetworkProcess
​https://bugs.webkit.org/show_bug.cgi?id=202557

Reviewed by Youenn Fablet.

Source/WebCore:

They are only ever used in the WebProcess in SecurityOrigin::canDisplay.
If someone adds code that uses them in the NetworkProcess, they will hit my new assertion.

No change in behavior.

• page/SecurityOrigin.cpp:

(WebCore::SecurityOrigin::canDisplay const):

• platform/RuntimeApplicationChecks.h:

(WebCore::isInNetworkProcess):

• platform/cocoa/RuntimeApplicationChecksCocoa.mm:

(WebCore::isInNetworkProcess):

Source/WebKit:

• NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::initializeNetworkProcess):
(WebKit::NetworkProcess::registerURLSchemeAsDisplayIsolated const): Deleted.

• NetworkProcess/NetworkProcess.h:
• NetworkProcess/NetworkProcess.messages.in:
• NetworkProcess/NetworkProcessCreationParameters.cpp:

(WebKit::NetworkProcessCreationParameters::encode const):
(WebKit::NetworkProcessCreationParameters::decode):

• NetworkProcess/NetworkProcessCreationParameters.h:
• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::ensureNetworkProcess):
(WebKit::WebProcessPool::registerURLSchemeAsDisplayIsolated):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/SecurityOrigin.cpp (modified) (2 diffs)
• WebCore/platform/RuntimeApplicationChecks.h (modified) (2 diffs)
• WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/NetworkProcess.cpp (modified) (2 diffs)
• WebKit/NetworkProcess/NetworkProcess.h (modified) (1 diff)
• WebKit/NetworkProcess/NetworkProcess.messages.in (modified) (1 diff)
• WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (modified) (2 diffs)
• WebKit/NetworkProcess/NetworkProcessCreationParameters.h (modified) (1 diff)
• WebKit/UIProcess/WebProcessPool.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2019-10-04  Alex Christensen  <achristensen@webkit.org>
+
+        Stop sending list of display-isolated schemes to NetworkProcess
+        https://bugs.webkit.org/show_bug.cgi?id=202557
+
+        Reviewed by Youenn Fablet.
+
+        They are only ever used in the WebProcess in SecurityOrigin::canDisplay.
+        If someone adds code that uses them in the NetworkProcess, they will hit my new assertion.
+
+        No change in behavior.
+
+        * page/SecurityOrigin.cpp:
+        (WebCore::SecurityOrigin::canDisplay const):
+        * platform/RuntimeApplicationChecks.h:
+        (WebCore::isInNetworkProcess):
+        * platform/cocoa/RuntimeApplicationChecksCocoa.mm:
+        (WebCore::isInNetworkProcess):
+
 2019-10-04  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/page/SecurityOrigin.cpp ¶

@@ -34 +34 @@
 #include "OriginAccessEntry.h"
 #include "PublicSuffix.h"
+#include "RuntimeApplicationChecks.h"
 #include "SecurityPolicy.h"
 #include "TextEncoding.h"
@@ -354 +355 @@
 bool SecurityOrigin::canDisplay(const URL& url) const
 {
+    ASSERT(!isInNetworkProcess());
     if (m_universalAccess)
         return true;

trunk/Source/WebCore/platform/RuntimeApplicationChecks.h ¶

@@ -42 +42 @@
 
 bool isInWebProcess();
+bool isInNetworkProcess();
 
 WEBCORE_EXPORT void setApplicationSDKVersion(uint32_t);
@@ -104 +105 @@
 #endif // PLATFORM(IOS_FAMILY)
 
+#else
+
+inline bool isInNetworkProcess() { return false; }
+
 #endif // PLATFORM(COCOA)
 

trunk/Source/WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm ¶

@@ -91 +91 @@
 }
 
+bool isInNetworkProcess()
+{
+    static bool mainBundleIsNetworkProcess = [[[NSBundle mainBundle] bundleIdentifier] hasPrefix:@"com.apple.WebKit.Networking"];
+    return mainBundleIsNetworkProcess;
+}
+
 static bool applicationBundleIsEqualTo(const String& bundleIdentifierString)
 {

trunk/Source/WebKit/ChangeLog ¶

@@ +1 @@
+2019-10-04  Alex Christensen  <achristensen@webkit.org>
+
+        Stop sending list of display-isolated schemes to NetworkProcess
+        https://bugs.webkit.org/show_bug.cgi?id=202557
+
+        Reviewed by Youenn Fablet.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::initializeNetworkProcess):
+        (WebKit::NetworkProcess::registerURLSchemeAsDisplayIsolated const): Deleted.
+        * NetworkProcess/NetworkProcess.h:
+        * NetworkProcess/NetworkProcess.messages.in:
+        * NetworkProcess/NetworkProcessCreationParameters.cpp:
+        (WebKit::NetworkProcessCreationParameters::encode const):
+        (WebKit::NetworkProcessCreationParameters::decode):
+        * NetworkProcess/NetworkProcessCreationParameters.h:
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::ensureNetworkProcess):
+        (WebKit::WebProcessPool::registerURLSchemeAsDisplayIsolated):
+
 2019-10-04  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp ¶

@@ -351 +351 @@
         registerURLSchemeAsNoAccess(scheme);
 
-    for (auto& scheme : parameters.urlSchemesRegisteredAsDisplayIsolated)
-        registerURLSchemeAsDisplayIsolated(scheme);
-
     for (auto& scheme : parameters.urlSchemesRegisteredAsCORSEnabled)
         registerURLSchemeAsCORSEnabled(scheme);
@@ -2222 +2219 @@
 }
 
-void NetworkProcess::registerURLSchemeAsDisplayIsolated(const String& scheme) const
-{
-    LegacySchemeRegistry::registerURLSchemeAsDisplayIsolated(scheme);
-}
-
 void NetworkProcess::registerURLSchemeAsCORSEnabled(const String& scheme) const
 {

trunk/Source/WebKit/NetworkProcess/NetworkProcess.h ¶

@@ -440 +440 @@
     void registerURLSchemeAsLocal(const String&) const;
     void registerURLSchemeAsNoAccess(const String&) const;
-    void registerURLSchemeAsDisplayIsolated(const String&) const;
     void registerURLSchemeAsCORSEnabled(const String&) const;
     void registerURLSchemeAsCanDisplayOnlyIfCanRequest(const String&) const;

trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in ¶

@@ -147 +147 @@
     RegisterURLSchemeAsLocal(String scheme)
     RegisterURLSchemeAsNoAccess(String scheme)
-    RegisterURLSchemeAsDisplayIsolated(String scheme)
     RegisterURLSchemeAsCORSEnabled(String scheme)
     RegisterURLSchemeAsCanDisplayOnlyIfCanRequest(String scheme)

trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp ¶

@@ -73 +73 @@
     encoder << urlSchemesRegisteredAsLocal;
     encoder << urlSchemesRegisteredAsNoAccess;
-    encoder << urlSchemesRegisteredAsDisplayIsolated;
     encoder << urlSchemesRegisteredAsCORSEnabled;
     encoder << urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest;
@@ -161 +160 @@
     if (!decoder.decode(result.urlSchemesRegisteredAsNoAccess))
         return false;
-    if (!decoder.decode(result.urlSchemesRegisteredAsDisplayIsolated))
-        return false;
     if (!decoder.decode(result.urlSchemesRegisteredAsCORSEnabled))
         return false;

trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h ¶

@@ -90 +90 @@
     Vector<String> urlSchemesRegisteredAsLocal;
     Vector<String> urlSchemesRegisteredAsNoAccess;
-    Vector<String> urlSchemesRegisteredAsDisplayIsolated;
     Vector<String> urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest;
     Vector<String> urlSchemesRegisteredAsCORSEnabled;

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp ¶

@@ -522 +522 @@
     parameters.urlSchemesRegisteredAsLocal = copyToVector(m_schemesToRegisterAsLocal);
     parameters.urlSchemesRegisteredAsNoAccess = copyToVector(m_schemesToRegisterAsNoAccess);
-    parameters.urlSchemesRegisteredAsDisplayIsolated = copyToVector(m_schemesToRegisterAsDisplayIsolated);
     parameters.urlSchemesRegisteredAsCORSEnabled = copyToVector(m_schemesToRegisterAsCORSEnabled);
     parameters.urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest = copyToVector(m_schemesToRegisterAsCanDisplayOnlyIfCanRequest);
@@ -1495 +1494 @@
     m_schemesToRegisterAsDisplayIsolated.add(urlScheme);
     sendToAllProcesses(Messages::WebProcess::RegisterURLSchemeAsDisplayIsolated(urlScheme));
-    sendToNetworkingProcess(Messages::NetworkProcess::RegisterURLSchemeAsDisplayIsolated(urlScheme));
 }