Title: [250456] trunk/Source/WebKit
- Revision
- 250456
- Author
- achristen...@apple.com
- Date
- 2019-09-27 13:49:49 -0700 (Fri, 27 Sep 2019)
Log Message
Layout Test http/tests/cache-storage/cache-records-persistency.https.html is failing
https://bugs.webkit.org/show_bug.cgi?id=202323
Reviewed by Tim Horton.
This reverts most of r250351.
It turns out NetworkProcessProxy::addSession has some side effects in the UIProcess that are useful for NetworkProcess resumption after crashes. Let's keep that.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::initializeNetworkProcess):
* NetworkProcess/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::encode const):
(WebKit::NetworkProcessCreationParameters::decode):
* NetworkProcess/NetworkProcessCreationParameters.h:
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::ensureNetworkProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (250455 => 250456)
--- trunk/Source/WebKit/ChangeLog 2019-09-27 20:38:25 UTC (rev 250455)
+++ trunk/Source/WebKit/ChangeLog 2019-09-27 20:49:49 UTC (rev 250456)
@@ -1,3 +1,22 @@
+2019-09-27 Alex Christensen <achristen...@webkit.org>
+
+ Layout Test http/tests/cache-storage/cache-records-persistency.https.html is failing
+ https://bugs.webkit.org/show_bug.cgi?id=202323
+
+ Reviewed by Tim Horton.
+
+ This reverts most of r250351.
+ It turns out NetworkProcessProxy::addSession has some side effects in the UIProcess that are useful for NetworkProcess resumption after crashes. Let's keep that.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::initializeNetworkProcess):
+ * NetworkProcess/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode const):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * NetworkProcess/NetworkProcessCreationParameters.h:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::ensureNetworkProcess):
+
2019-09-27 Jer Noble <jer.no...@apple.com>
Unreviewed build-fix: wrap the AssertionServicesSPI.h in an IOS_FAMILY check.
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (250455 => 250456)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-09-27 20:38:25 UTC (rev 250455)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-09-27 20:49:49 UTC (rev 250456)
@@ -322,8 +322,6 @@
auto sessionID = parameters.defaultDataStoreParameters.networkSessionParameters.sessionID;
setSession(sessionID, NetworkSession::create(*this, WTFMove(parameters.defaultDataStoreParameters.networkSessionParameters)));
- for (auto&& parameters : WTFMove(parameters.nonDefaultDataStoreParameters))
- addWebsiteDataStore(WTFMove(parameters));
#if ENABLE(INDEXED_DATABASE)
addIndexedDatabaseSession(sessionID, parameters.defaultDataStoreParameters.indexedDatabaseDirectory, parameters.defaultDataStoreParameters.indexedDatabaseDirectoryExtensionHandle);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (250455 => 250456)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2019-09-27 20:38:25 UTC (rev 250455)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2019-09-27 20:49:49 UTC (rev 250456)
@@ -62,7 +62,6 @@
encoder << suppressesConnectionTerminationOnSystemChange;
#endif
encoder << defaultDataStoreParameters;
- encoder << nonDefaultDataStoreParameters;
#if USE(SOUP)
encoder.encodeEnum(cookieAcceptPolicy);
encoder << ignoreTLSErrors;
@@ -146,12 +145,6 @@
return false;
result.defaultDataStoreParameters = WTFMove(*defaultDataStoreParameters);
- Optional<Vector<WebsiteDataStoreParameters>> nonDefaultDataStoreParameters;
- decoder >> nonDefaultDataStoreParameters;
- if (!nonDefaultDataStoreParameters)
- return false;
- result.nonDefaultDataStoreParameters = WTFMove(*nonDefaultDataStoreParameters);
-
#if USE(SOUP)
if (!decoder.decodeEnum(result.cookieAcceptPolicy))
return false;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (250455 => 250456)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2019-09-27 20:38:25 UTC (rev 250455)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2019-09-27 20:49:49 UTC (rev 250456)
@@ -78,7 +78,6 @@
#endif
WebsiteDataStoreParameters defaultDataStoreParameters;
- Vector<WebsiteDataStoreParameters> nonDefaultDataStoreParameters;
#if USE(SOUP)
HTTPCookieAcceptPolicy cookieAcceptPolicy { HTTPCookieAcceptPolicy::AlwaysAccept };
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (250455 => 250456)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-09-27 20:38:25 UTC (rev 250455)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-09-27 20:49:49 UTC (rev 250456)
@@ -629,12 +629,6 @@
// Add any platform specific parameters
platformInitializeNetworkProcess(parameters);
- // Make sure the network process knows about all the sessions that have been registered before it started.
- for (auto& sessionID : m_sessionToPageIDsMap.keys()) {
- if (auto* websiteDataStore = WebsiteDataStore::existingNonDefaultDataStoreForSessionID(sessionID))
- parameters.nonDefaultDataStoreParameters.append(websiteDataStore->parameters());
- }
-
// Initialize the network process.
networkProcess->send(Messages::NetworkProcess::InitializeNetworkProcess(parameters), 0);
@@ -652,6 +646,12 @@
withWebsiteDataStore->clearPendingCookies();
}
+ // Make sure the network process knows about all the sessions that have been registered before it started.
+ for (auto& sessionID : m_sessionToPageIDsMap.keys()) {
+ if (auto* websiteDataStore = WebsiteDataStore::existingNonDefaultDataStoreForSessionID(sessionID))
+ networkProcess->addSession(*websiteDataStore);
+ }
+
m_networkProcess = WTFMove(networkProcess);
return *m_networkProcess;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
