Diff
Modified: trunk/Source/WebCore/ChangeLog (251658 => 251659)
--- trunk/Source/WebCore/ChangeLog 2019-10-28 17:01:55 UTC (rev 251658)
+++ trunk/Source/WebCore/ChangeLog 2019-10-28 17:53:56 UTC (rev 251659)
@@ -1,3 +1,15 @@
+2019-10-28 Alex Christensen <[email protected]>
+
+ Remove unused NetworkProcessCreationParameters.urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest
+ https://bugs.webkit.org/show_bug.cgi?id=203393
+
+ Reviewed by Chris Dumez.
+
+ * platform/LegacySchemeRegistry.cpp:
+ (WebCore::canDisplayOnlyIfCanRequestSchemes):
+ (WebCore::LegacySchemeRegistry::canDisplayOnlyIfCanRequest):
+ (WebCore::LegacySchemeRegistry::registerAsCanDisplayOnlyIfCanRequest):
+
2019-10-28 Antoine Quint <[email protected]>
CSS Transitions and CSS Animations properties should treat unitless 0 as an invalid value for times
Modified: trunk/Source/WebCore/platform/LegacySchemeRegistry.cpp (251658 => 251659)
--- trunk/Source/WebCore/platform/LegacySchemeRegistry.cpp 2019-10-28 17:01:55 UTC (rev 251658)
+++ trunk/Source/WebCore/platform/LegacySchemeRegistry.cpp 2019-10-28 17:53:56 UTC (rev 251659)
@@ -207,6 +207,7 @@
static URLSchemesMap& canDisplayOnlyIfCanRequestSchemes()
{
+ ASSERT(!isInNetworkProcess());
ASSERT(schemeRegistryLock.isHeld());
static auto canDisplayOnlyIfCanRequestSchemes = makeNeverDestroyedSchemeSet(builtinCanDisplayOnlyIfCanRequestSchemes);
return canDisplayOnlyIfCanRequestSchemes;
@@ -380,6 +381,7 @@
bool LegacySchemeRegistry::canDisplayOnlyIfCanRequest(const String& scheme)
{
+ ASSERT(!isInNetworkProcess());
if (scheme.isNull())
return false;
@@ -389,6 +391,7 @@
void LegacySchemeRegistry::registerAsCanDisplayOnlyIfCanRequest(const String& scheme)
{
+ ASSERT(!isInNetworkProcess());
if (scheme.isNull())
return;
Modified: trunk/Source/WebKit/ChangeLog (251658 => 251659)
--- trunk/Source/WebKit/ChangeLog 2019-10-28 17:01:55 UTC (rev 251658)
+++ trunk/Source/WebKit/ChangeLog 2019-10-28 17:53:56 UTC (rev 251659)
@@ -1,3 +1,23 @@
+2019-10-28 Alex Christensen <[email protected]>
+
+ Remove unused NetworkProcessCreationParameters.urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest
+ https://bugs.webkit.org/show_bug.cgi?id=203393
+
+ Reviewed by Chris Dumez.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::initializeNetworkProcess):
+ (WebKit::NetworkProcess::registerURLSchemeAsCanDisplayOnlyIfCanRequest 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::registerURLSchemeAsCanDisplayOnlyIfCanRequest):
+
2019-10-28 Carlos Alberto Lopez Perez <[email protected]>
[GTK][WPE] Enable CSS typed OM
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (251658 => 251659)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-10-28 17:01:55 UTC (rev 251658)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-10-28 17:53:56 UTC (rev 251659)
@@ -349,9 +349,6 @@
for (auto& scheme : parameters.urlSchemesRegisteredAsNoAccess)
registerURLSchemeAsNoAccess(scheme);
-
- for (auto& scheme : parameters.urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest)
- registerURLSchemeAsCanDisplayOnlyIfCanRequest(scheme);
RELEASE_LOG(Process, "%p - NetworkProcess::initializeNetworkProcess: Presenting process = %d", this, WebCore::presentingApplicationPID());
}
@@ -2200,11 +2197,6 @@
LegacySchemeRegistry::registerURLSchemeAsNoAccess(scheme);
}
-void NetworkProcess::registerURLSchemeAsCanDisplayOnlyIfCanRequest(const String& scheme) const
-{
- LegacySchemeRegistry::registerAsCanDisplayOnlyIfCanRequest(scheme);
-}
-
void NetworkProcess::didSyncAllCookies()
{
parentProcessConnection()->send(Messages::NetworkProcessProxy::DidSyncAllCookies(), 0);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (251658 => 251659)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-10-28 17:01:55 UTC (rev 251658)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-10-28 17:53:56 UTC (rev 251659)
@@ -435,7 +435,6 @@
void registerURLSchemeAsLocal(const String&) const;
void registerURLSchemeAsNoAccess(const String&) const;
void registerURLSchemeAsCORSEnabled(const String&) const;
- void registerURLSchemeAsCanDisplayOnlyIfCanRequest(const String&) const;
#if ENABLE(INDEXED_DATABASE)
void addIndexedDatabaseSession(PAL::SessionID, String&, SandboxExtension::Handle&);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in (251658 => 251659)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2019-10-28 17:01:55 UTC (rev 251658)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2019-10-28 17:53:56 UTC (rev 251659)
@@ -144,7 +144,6 @@
RegisterURLSchemeAsBypassingContentSecurityPolicy(String scheme)
RegisterURLSchemeAsLocal(String scheme)
RegisterURLSchemeAsNoAccess(String scheme)
- RegisterURLSchemeAsCanDisplayOnlyIfCanRequest(String scheme)
SetCacheStorageParameters(PAL::SessionID sessionID, String cacheStorageDirectory, WebKit::SandboxExtension::Handle handle);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (251658 => 251659)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2019-10-28 17:01:55 UTC (rev 251658)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2019-10-28 17:53:56 UTC (rev 251659)
@@ -72,7 +72,6 @@
encoder << urlSchemesRegisteredAsBypassingContentSecurityPolicy;
encoder << urlSchemesRegisteredAsLocal;
encoder << urlSchemesRegisteredAsNoAccess;
- encoder << urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest;
#if ENABLE(SERVICE_WORKER)
encoder << serviceWorkerRegistrationDirectory << serviceWorkerRegistrationDirectoryExtensionHandle << urlSchemesServiceWorkersCanHandle << shouldDisableServiceWorkerProcessTerminationDelay;
@@ -158,8 +157,6 @@
return false;
if (!decoder.decode(result.urlSchemesRegisteredAsNoAccess))
return false;
- if (!decoder.decode(result.urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest))
- return false;
#if ENABLE(SERVICE_WORKER)
if (!decoder.decode(result.serviceWorkerRegistrationDirectory))
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (251658 => 251659)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2019-10-28 17:01:55 UTC (rev 251658)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2019-10-28 17:53:56 UTC (rev 251659)
@@ -89,7 +89,6 @@
Vector<String> urlSchemesRegisteredAsBypassingContentSecurityPolicy;
Vector<String> urlSchemesRegisteredAsLocal;
Vector<String> urlSchemesRegisteredAsNoAccess;
- Vector<String> urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest;
#if ENABLE(SERVICE_WORKER)
String serviceWorkerRegistrationDirectory;
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (251658 => 251659)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-10-28 17:01:55 UTC (rev 251658)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-10-28 17:53:56 UTC (rev 251659)
@@ -523,7 +523,6 @@
parameters.urlSchemesRegisteredAsBypassingContentSecurityPolicy = copyToVector(m_schemesToRegisterAsBypassingContentSecurityPolicy);
parameters.urlSchemesRegisteredAsLocal = copyToVector(m_schemesToRegisterAsLocal);
parameters.urlSchemesRegisteredAsNoAccess = copyToVector(m_schemesToRegisterAsNoAccess);
- parameters.urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest = copyToVector(m_schemesToRegisterAsCanDisplayOnlyIfCanRequest);
#if ENABLE(INDEXED_DATABASE)
// *********
@@ -1551,7 +1550,6 @@
{
m_schemesToRegisterAsCanDisplayOnlyIfCanRequest.add(urlScheme);
sendToAllProcesses(Messages::WebProcess::RegisterURLSchemeAsCanDisplayOnlyIfCanRequest(urlScheme));
- sendToNetworkingProcess(Messages::NetworkProcess::RegisterURLSchemeAsCanDisplayOnlyIfCanRequest(urlScheme));
}
void WebProcessPool::updateBackForwardCacheCapacity()
