Fix API tests after r223791.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 21 Oct 2017 01:11:14 +0000 (01:11 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 21 Oct 2017 01:11:14 +0000 (01:11 +0000)
https://bugs.webkit.org/show_bug.cgi?id=178418

* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::ensureNetworkProcess):
Whatever NetworkSessionInitializationParameters we send with the NetworkProcess initialization message,
that's the default session.  This is needed for WebKit.WebsiteDataStoreCustomPaths.
(WebKit::WebProcessPool::createNewWebProcess):
Don't change behavior or NetworkProcess initialization like I did in r223791.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@223803 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/UIProcess/WebProcessPool.cpp

index e1b3858..b87ddc9 100644 (file)
@@ -1,5 +1,17 @@
 2017-10-20  Alex Christensen  <achristensen@webkit.org>
 
+        Fix API tests after r223791.
+        https://bugs.webkit.org/show_bug.cgi?id=178418
+
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::ensureNetworkProcess):
+        Whatever NetworkSessionInitializationParameters we send with the NetworkProcess initialization message,
+        that's the default session.  This is needed for WebKit.WebsiteDataStoreCustomPaths.
+        (WebKit::WebProcessPool::createNewWebProcess):
+        Don't change behavior or NetworkProcess initialization like I did in r223791.
+
+2017-10-20  Alex Christensen  <achristensen@webkit.org>
+
         Fix download tests on El Capitan after r223730
         https://bugs.webkit.org/show_bug.cgi?id=178547
 
index c6bdd9d..24dace2 100644 (file)
@@ -427,6 +427,7 @@ NetworkProcessProxy& WebProcessPool::ensureNetworkProcess(WebsiteDataStore* with
     if (withWebsiteDataStore) {
         auto websiteDataStoreParameters = withWebsiteDataStore->parameters();
         parameters.defaultSessionParameters = websiteDataStoreParameters.networkSessionParameters;
+        parameters.defaultSessionParameters.sessionID = PAL::SessionID::defaultSessionID();
     }
     
     parameters.privateBrowsingEnabled = WebPreferences::anyPagesAreUsingPrivateBrowsing();
@@ -682,7 +683,7 @@ void WebProcessPool::resolvePathsForSandboxExtensions()
 
 WebProcessProxy& WebProcessPool::createNewWebProcess(WebsiteDataStore& websiteDataStore)
 {
-    ensureNetworkProcess(&websiteDataStore);
+    ensureNetworkProcess();
 
     Ref<WebProcessProxy> process = WebProcessProxy::create(*this, websiteDataStore);