Title: [238745] trunk/Source/WebKit
Revision
238745
Author
[email protected]
Date
2018-11-30 11:37:04 -0800 (Fri, 30 Nov 2018)

Log Message

Remove privateBrowsingEnabled from NetworkProcessCreationParameters
https://bugs.webkit.org/show_bug.cgi?id=192156

Reviewed by Chris Dumez.

* 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 (238744 => 238745)


--- trunk/Source/WebKit/ChangeLog	2018-11-30 19:21:27 UTC (rev 238744)
+++ trunk/Source/WebKit/ChangeLog	2018-11-30 19:37:04 UTC (rev 238745)
@@ -1,3 +1,19 @@
+2018-11-30  Alex Christensen  <[email protected]>
+
+        Remove privateBrowsingEnabled from NetworkProcessCreationParameters
+        https://bugs.webkit.org/show_bug.cgi?id=192156
+
+        Reviewed by Chris Dumez.
+
+        * 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):
+
 2018-11-30  Basuke Suzuki  <[email protected]>
 
         [Curl] Add API for ProtectionSpace.

Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (238744 => 238745)


--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp	2018-11-30 19:21:27 UTC (rev 238744)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp	2018-11-30 19:37:04 UTC (rev 238745)
@@ -313,10 +313,6 @@
 
     setCanHandleHTTPSServerTrustEvaluation(parameters.canHandleHTTPSServerTrustEvaluation);
 
-    // FIXME: instead of handling this here, a message should be sent later (scales to multiple sessions)
-    if (parameters.privateBrowsingEnabled)
-        RemoteNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters::legacyPrivateSessionParameters());
-
     if (parameters.shouldUseTestingNetworkSession)
         NetworkStorageSession::switchToNewTestingSession();
 

Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (238744 => 238745)


--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp	2018-11-30 19:21:27 UTC (rev 238744)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp	2018-11-30 19:37:04 UTC (rev 238745)
@@ -41,7 +41,6 @@
 
 void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
 {
-    encoder << privateBrowsingEnabled;
     encoder.encodeEnum(cacheModel);
     encoder << diskCacheSizeOverride;
     encoder << canHandleHTTPSServerTrustEvaluation;
@@ -119,8 +118,6 @@
 
 bool NetworkProcessCreationParameters::decode(IPC::Decoder& decoder, NetworkProcessCreationParameters& result)
 {
-    if (!decoder.decode(result.privateBrowsingEnabled))
-        return false;
     if (!decoder.decodeEnum(result.cacheModel))
         return false;
     if (!decoder.decode(result.diskCacheSizeOverride))

Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (238744 => 238745)


--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h	2018-11-30 19:21:27 UTC (rev 238744)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h	2018-11-30 19:37:04 UTC (rev 238745)
@@ -51,7 +51,6 @@
     void encode(IPC::Encoder&) const;
     static bool decode(IPC::Decoder&, NetworkProcessCreationParameters&);
 
-    bool privateBrowsingEnabled { false };
     CacheModel cacheModel { CacheModelDocumentViewer };
     int64_t diskCacheSizeOverride { -1 };
     bool canHandleHTTPSServerTrustEvaluation { true };

Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (238744 => 238745)


--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp	2018-11-30 19:21:27 UTC (rev 238744)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp	2018-11-30 19:37:04 UTC (rev 238745)
@@ -480,8 +480,6 @@
         m_websiteDataStore->websiteDataStore().clearPendingCookies();
     }
 
-    parameters.privateBrowsingEnabled = WebPreferences::anyPagesAreUsingPrivateBrowsing();
-
     parameters.cacheModel = cacheModel();
     parameters.diskCacheSizeOverride = m_configuration->diskCacheSizeOverride();
     parameters.canHandleHTTPSServerTrustEvaluation = m_canHandleHTTPSServerTrustEvaluation;
@@ -558,6 +556,9 @@
     // Initialize the network process.
     m_networkProcess->send(Messages::NetworkProcess::InitializeNetworkProcess(parameters), 0);
 
+    if (WebPreferences::anyPagesAreUsingPrivateBrowsing())
+        m_networkProcess->send(Messages::NetworkProcess::AddWebsiteDataStore(WebsiteDataStoreParameters::legacyPrivateSessionParameters()), 0);
+
 #if PLATFORM(COCOA)
     m_networkProcess->send(Messages::NetworkProcess::SetQOS(networkProcessLatencyQOS(), networkProcessThroughputQOS()), 0);
 #endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to