Diff
Modified: trunk/Source/WebKit/ChangeLog (230279 => 230280)
--- trunk/Source/WebKit/ChangeLog 2018-04-04 22:28:25 UTC (rev 230279)
+++ trunk/Source/WebKit/ChangeLog 2018-04-04 22:29:25 UTC (rev 230280)
@@ -1,5 +1,27 @@
2018-04-04 Alex Christensen <[email protected]>
+ Remove legacyCustomProtocolManager from NetworkSessionCreationParameters
+ https://bugs.webkit.org/show_bug.cgi?id=182178
+
+ Reviewed by Youenn Fablet.
+
+ Now that we only make NetworkSessions in the NetworkProcess, we don't need to pass this parameter around.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::initializeNetworkProcess):
+ * NetworkProcess/NetworkSessionCreationParameters.h:
+ (WebKit::NetworkSessionCreationParameters::decode):
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+ * NetworkProcess/mac/RemoteNetworkingContext.mm:
+ (WebKit::RemoteNetworkingContext::ensureWebsiteDataStoreSession):
+ * Shared/WebsiteDataStoreParameters.cpp:
+ (WebKit::WebsiteDataStoreParameters::privateSessionParameters):
+ * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
+ (WebKit::WebsiteDataStore::parameters):
+
+2018-04-04 Alex Christensen <[email protected]>
+
Move PingHandle to WebKitLegacy
https://bugs.webkit.org/show_bug.cgi?id=184145
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (230279 => 230280)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-04-04 22:28:25 UTC (rev 230279)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-04-04 22:29:25 UTC (rev 230280)
@@ -272,9 +272,6 @@
m_logCookieInformation = parameters.logCookieInformation;
#endif
-#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
- parameters.defaultSessionParameters.legacyCustomProtocolManager = supplement<LegacyCustomProtocolManager>();
-#endif
SessionTracker::setSession(PAL::SessionID::defaultSessionID(), NetworkSession::create(WTFMove(parameters.defaultSessionParameters)));
for (auto& supplement : m_supplements.values())
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h (230279 => 230280)
--- trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h 2018-04-04 22:28:25 UTC (rev 230279)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h 2018-04-04 22:29:25 UTC (rev 230280)
@@ -41,7 +41,6 @@
static std::optional<NetworkSessionCreationParameters> decode(IPC::Decoder&);
PAL::SessionID sessionID { PAL::SessionID::defaultSessionID() };
- LegacyCustomProtocolManager* legacyCustomProtocolManager { nullptr };
String boundInterfaceIdentifier;
AllowsCellularAccess allowsCellularAccess { AllowsCellularAccess::Yes };
};
@@ -69,7 +68,7 @@
if (!allowsCellularAccess)
return std::nullopt;
- return {{ sessionID, nullptr, WTFMove(*boundInterfaceIdentifier), WTFMove(*allowsCellularAccess) }};
+ return {{ sessionID, WTFMove(*boundInterfaceIdentifier), WTFMove(*allowsCellularAccess) }};
}
} // namespace WebKit
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (230279 => 230280)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2018-04-04 22:28:25 UTC (rev 230279)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2018-04-04 22:29:25 UTC (rev 230280)
@@ -679,9 +679,10 @@
configuration._CTDataConnectionServiceType = ctDataConnectionServiceType;
#endif
- if (parameters.legacyCustomProtocolManager)
- parameters.legacyCustomProtocolManager->registerProtocolClass(configuration);
-
+#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
+ NetworkProcess::singleton().supplement<LegacyCustomProtocolManager>()->registerProtocolClass(configuration);
+#endif
+
#if HAVE(TIMINGDATAOPTIONS)
configuration._timingDataOptions = _TimingDataOptionsEnableW3CNavigationTiming;
#else
Modified: trunk/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm (230279 => 230280)
--- trunk/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm 2018-04-04 22:28:25 UTC (rev 230279)
+++ trunk/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm 2018-04-04 22:29:25 UTC (rev 230280)
@@ -73,7 +73,6 @@
session->setCacheStoragePerOriginQuota(parameters.cacheStoragePerOriginQuota);
}
- parameters.networkSessionParameters.legacyCustomProtocolManager = NetworkProcess::singleton().supplement<LegacyCustomProtocolManager>();
SessionTracker::setSession(sessionID, NetworkSession::create(WTFMove(parameters.networkSessionParameters)));
}
Modified: trunk/Source/WebKit/Shared/WebsiteDataStoreParameters.cpp (230279 => 230280)
--- trunk/Source/WebKit/Shared/WebsiteDataStoreParameters.cpp 2018-04-04 22:28:25 UTC (rev 230279)
+++ trunk/Source/WebKit/Shared/WebsiteDataStoreParameters.cpp 2018-04-04 22:29:25 UTC (rev 230280)
@@ -89,7 +89,7 @@
WebsiteDataStoreParameters WebsiteDataStoreParameters::privateSessionParameters(PAL::SessionID sessionID)
{
ASSERT(sessionID.isEphemeral());
- return { { }, { }, { }, { }, WebsiteDataStore::defaultCacheStoragePerOriginQuota, { }, { sessionID, { }, { }, AllowsCellularAccess::Yes }};
+ return { { }, { }, { }, { }, WebsiteDataStore::defaultCacheStoragePerOriginQuota, { }, { sessionID, { }, AllowsCellularAccess::Yes }};
}
} // namespace WebKit
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm (230279 => 230280)
--- trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2018-04-04 22:28:25 UTC (rev 230279)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2018-04-04 22:29:25 UTC (rev 230280)
@@ -58,7 +58,7 @@
resolveDirectoriesIfNecessary();
WebsiteDataStoreParameters parameters;
- parameters.networkSessionParameters = { m_sessionID, nullptr, m_boundInterfaceIdentifier, m_allowsCellularAccess };
+ parameters.networkSessionParameters = { m_sessionID, m_boundInterfaceIdentifier, m_allowsCellularAccess };
auto cookieFile = resolvedCookieStorageFile();
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (230279 => 230280)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-04-04 22:28:25 UTC (rev 230279)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-04-04 22:29:25 UTC (rev 230280)
@@ -2803,7 +2803,7 @@
void WebPage::setSessionID(PAL::SessionID sessionID)
{
if (sessionID.isEphemeral())
- WebProcess::singleton().addWebsiteDataStore({{ }, { }, { }, { }, { }, { }, { sessionID, { }, { }, { }}});
+ WebProcess::singleton().addWebsiteDataStore(WebsiteDataStoreParameters::privateSessionParameters(sessionID));
m_page->setSessionID(sessionID);
}
