Title: [235179] trunk/Source/WebKit
- Revision
- 235179
- Author
- sihui_...@apple.com
- Date
- 2018-08-22 10:17:34 -0700 (Wed, 22 Aug 2018)
Log Message
Try removing defaultSessionParameters from NetworkProcessCreationParameters
https://bugs.webkit.org/show_bug.cgi?id=188831
Reviewed by Alex Christensen.
* 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 (235178 => 235179)
--- trunk/Source/WebKit/ChangeLog 2018-08-22 17:10:34 UTC (rev 235178)
+++ trunk/Source/WebKit/ChangeLog 2018-08-22 17:17:34 UTC (rev 235179)
@@ -1,3 +1,19 @@
+2018-08-22 Sihui Liu <sihui_...@apple.com>
+
+ Try removing defaultSessionParameters from NetworkProcessCreationParameters
+ https://bugs.webkit.org/show_bug.cgi?id=188831
+
+ Reviewed by Alex Christensen.
+
+ * 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-08-22 Tim Horton <timothy_hor...@apple.com>
Use unified build for WebProcess
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (235178 => 235179)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-08-22 17:10:34 UTC (rev 235178)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-08-22 17:17:34 UTC (rev 235179)
@@ -46,6 +46,7 @@
#include "NetworkProximityManager.h"
#include "NetworkResourceLoader.h"
#include "NetworkSession.h"
+#include "NetworkSessionCreationParameters.h"
#include "PreconnectTask.h"
#include "RemoteNetworkingContext.h"
#include "SessionTracker.h"
@@ -286,7 +287,7 @@
m_logCookieInformation = parameters.logCookieInformation;
#endif
- SessionTracker::setSession(PAL::SessionID::defaultSessionID(), NetworkSession::create(WTFMove(parameters.defaultSessionParameters)));
+ SessionTracker::setSession(PAL::SessionID::defaultSessionID(), NetworkSession::create(NetworkSessionCreationParameters()));
auto* defaultSession = SessionTracker::networkSession(PAL::SessionID::defaultSessionID());
for (const auto& cookie : parameters.defaultSessionPendingCookies)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (235178 => 235179)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2018-08-22 17:10:34 UTC (rev 235178)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2018-08-22 17:17:34 UTC (rev 235179)
@@ -41,7 +41,6 @@
void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
{
- encoder << defaultSessionParameters;
encoder << privateBrowsingEnabled;
encoder.encodeEnum(cacheModel);
encoder << diskCacheSizeOverride;
@@ -113,12 +112,6 @@
bool NetworkProcessCreationParameters::decode(IPC::Decoder& decoder, NetworkProcessCreationParameters& result)
{
- std::optional<NetworkSessionCreationParameters> defaultSessionParameters;
- decoder >> defaultSessionParameters;
- if (!defaultSessionParameters)
- return false;
- result.defaultSessionParameters = WTFMove(*defaultSessionParameters);
-
if (!decoder.decode(result.privateBrowsingEnabled))
return false;
if (!decoder.decodeEnum(result.cacheModel))
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (235178 => 235179)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2018-08-22 17:10:34 UTC (rev 235178)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2018-08-22 17:17:34 UTC (rev 235179)
@@ -51,7 +51,6 @@
void encode(IPC::Encoder&) const;
static bool decode(IPC::Decoder&, NetworkProcessCreationParameters&);
- NetworkSessionCreationParameters defaultSessionParameters;
bool privateBrowsingEnabled { false };
CacheModel cacheModel { CacheModelDocumentViewer };
int64_t diskCacheSizeOverride { -1 };
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (235178 => 235179)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2018-08-22 17:10:34 UTC (rev 235178)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2018-08-22 17:17:34 UTC (rev 235179)
@@ -490,15 +490,6 @@
NetworkProcessCreationParameters parameters;
- if (withWebsiteDataStore) {
- auto websiteDataStoreParameters = withWebsiteDataStore->parameters();
- parameters.defaultSessionParameters = WTFMove(websiteDataStoreParameters.networkSessionParameters);
-
- // FIXME: This isn't conceptually correct, but it's needed to preserve behavior introduced in r213241.
- // 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();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
