Attachment 347740 Details for Bug 188831 – Patch

[patch] Patch

bug-188831-20180821173611.patch (text/plain), 5.42 KB, created by Sihui Liu on 2018-08-21 17:36:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2018-08-21 17:36:12 PDT

Size: 5.42 KB

patch

obsolete

>Subversion Revision: 235123
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 5248e3f5f7c371854f00295d3aaf4ec9edcaae89..90b967d360390ea94d2257ec5bd698670d997944 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-08-21  Sihui Liu  <sihui_liu@apple.com>
>+
>+        Try removing defaultSessionParameters from NetworkProcessCreationParameters
>+        https://bugs.webkit.org/show_bug.cgi?id=188831
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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-21  Daniel Bates  <dabates@apple.com>
> 
>         Replace TextCheckingTypeMask with OptionSet
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>index cc24518eba5254e4b148ecae3767010693a09098..d58367077f96005f39289e59e351edb27507de8f 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>@@ -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 @@ void NetworkProcess::initializeNetworkProcess(NetworkProcessCreationParameters&&
>     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)
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>index ae7c1cd5a51a44b008d4fb2849fb3b54d2e1c267..cd7dba8e9a358c378fa955ecdfc3233f5a99304a 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>@@ -41,7 +41,6 @@ NetworkProcessCreationParameters::NetworkProcessCreationParameters()
> 
> void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
> {
>-    encoder << defaultSessionParameters;
>     encoder << privateBrowsingEnabled;
>     encoder.encodeEnum(cacheModel);
>     encoder << diskCacheSizeOverride;
>@@ -113,12 +112,6 @@ void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
> 
> 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))
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>index 00ed864fe44440664d38ceeaf58464487128edfe..54e6ab04c643e2ade0d44b5dea4fdf91feece7ed 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>+++ b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>@@ -51,7 +51,6 @@ struct NetworkProcessCreationParameters {
>     void encode(IPC::Encoder&) const;
>     static bool decode(IPC::Decoder&, NetworkProcessCreationParameters&);
> 
>-    NetworkSessionCreationParameters defaultSessionParameters;
>     bool privateBrowsingEnabled { false };
>     CacheModel cacheModel { CacheModelDocumentViewer };
>     int64_t diskCacheSizeOverride { -1 };
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
>index 7a93bf7a72a2bb682a8435a042c6d8058d56c9e8..0979d5eebe32c868d72f7532445e7829d9549a85 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.cpp
>+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
>@@ -490,15 +490,6 @@ NetworkProcessProxy& WebProcessPool::ensureNetworkProcess(WebsiteDataStore* with
> 
>     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();

Actions: View | Formatted Diff | Diff

Attachments on bug 188831: 347740