Changeset 250456 in webkit

Timestamp:

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

Author:

achristensen@apple.com

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):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (1 diff)
• NetworkProcess/NetworkProcessCreationParameters.cpp (modified) (2 diffs)
• NetworkProcess/NetworkProcessCreationParameters.h (modified) (1 diff)
• UIProcess/WebProcessPool.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-27  Alex Christensen  <achristensen@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.noble@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

@@ -323 +323 @@
     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)

trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp

@@ -63 +63 @@
 #endif
     encoder << defaultDataStoreParameters;
-    encoder << nonDefaultDataStoreParameters;
 #if USE(SOUP)
     encoder.encodeEnum(cookieAcceptPolicy);
@@ -147 +146 @@
     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))

trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h

@@ -79 +79 @@
 
     WebsiteDataStoreParameters defaultDataStoreParameters;
-    Vector<WebsiteDataStoreParameters> nonDefaultDataStoreParameters;
     
 #if USE(SOUP)

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -630 +630 @@
     platformInitializeNetworkProcess(parameters);
 
+    // Initialize the network process.
+    networkProcess->send(Messages::NetworkProcess::InitializeNetworkProcess(parameters), 0);
+
+#if PLATFORM(COCOA)
+    networkProcess->send(Messages::NetworkProcess::SetQOS(networkProcessLatencyQOS(), networkProcessThroughputQOS()), 0);
+#endif
+
+    if (m_didNetworkProcessCrash) {
+        m_didNetworkProcessCrash = false;
+        reinstateNetworkProcessAssertionState(*networkProcess);
+    }
+
+    if (withWebsiteDataStore) {
+        networkProcess->addSession(makeRef(*withWebsiteDataStore));
+        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))
-            parameters.nonDefaultDataStoreParameters.append(websiteDataStore->parameters());
-    }
-
-    // Initialize the network process.
-    networkProcess->send(Messages::NetworkProcess::InitializeNetworkProcess(parameters), 0);
-
-#if PLATFORM(COCOA)
-    networkProcess->send(Messages::NetworkProcess::SetQOS(networkProcessLatencyQOS(), networkProcessThroughputQOS()), 0);
-#endif
-
-    if (m_didNetworkProcessCrash) {
-        m_didNetworkProcessCrash = false;
-        reinstateNetworkProcessAssertionState(*networkProcess);
-    }
-
-    if (withWebsiteDataStore) {
-        networkProcess->addSession(makeRef(*withWebsiteDataStore));
-        withWebsiteDataStore->clearPendingCookies();
+            networkProcess->addSession(*websiteDataStore);
     }