Title: [233108] trunk/Source/WebKit
Revision
233108
Author
[email protected]
Date
2018-06-22 16:22:21 -0700 (Fri, 22 Jun 2018)

Log Message

REGRESSION (r231850): Cookie file cannot be read or written by network process
https://bugs.webkit.org/show_bug.cgi?id=186806
<rdar://problem/41113791>

Unreviewed. Fix failure after r233084 by adding missing initialization.


* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::ensureNetworkProcess):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (233107 => 233108)


--- trunk/Source/WebKit/ChangeLog	2018-06-22 23:05:50 UTC (rev 233107)
+++ trunk/Source/WebKit/ChangeLog	2018-06-22 23:22:21 UTC (rev 233108)
@@ -1,3 +1,14 @@
+2018-06-22  Sihui Liu  <[email protected]>
+
+        REGRESSION (r231850): Cookie file cannot be read or written by network process
+        https://bugs.webkit.org/show_bug.cgi?id=186806
+        <rdar://problem/41113791>
+
+        Unreviewed. Fix failure after r233084 by adding missing initialization.
+
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::ensureNetworkProcess):
+
 2018-06-22  Jer Noble  <[email protected]>
 
         [Fullscreen] Home indicator should show and hide with status bar

Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (233107 => 233108)


--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp	2018-06-22 23:05:50 UTC (rev 233107)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp	2018-06-22 23:22:21 UTC (rev 233108)
@@ -466,7 +466,12 @@
         // We should separate the concept of the default session from the currently used persistent session.
         parameters.defaultSessionParameters.sessionID = PAL::SessionID::defaultSessionID();
     }
-    
+
+    if (m_websiteDataStore) {
+        parameters.defaultSessionPendingCookies = copyToVector(m_websiteDataStore->websiteDataStore().pendingCookies());
+        m_websiteDataStore->websiteDataStore().clearPendingCookies();
+    }
+
     parameters.privateBrowsingEnabled = WebPreferences::anyPagesAreUsingPrivateBrowsing();
 
     parameters.cacheModel = cacheModel();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to