Attachment 347844 Details for Bug 188863 – Patch

[patch] Patch

bug-188863-20180822140148.patch (text/plain), 4.96 KB, created by Sihui Liu on 2018-08-22 14:01:49 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2018-08-22 14:01:49 PDT

Size: 4.96 KB

patch

obsolete

>Subversion Revision: 235181
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 840c64e573b53d824e29b5ffafc819fc14d119ee..c5f5106db121673e4e9dc8f437972af9a7d95454 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-08-22  Sihui Liu  <sihui_liu@apple.com>
>+
>+        Remove privateBrowsingEnabled from NetworkProcessCreationParameters
>+        https://bugs.webkit.org/show_bug.cgi?id=188863
>+
>+        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-22  Sihui Liu  <sihui_liu@apple.com>
> 
>         Try removing defaultSessionParameters from NetworkProcessCreationParameters
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>index d58367077f96005f39289e59e351edb27507de8f..d37fcabe91b2e25ad015ea09d1588a8a475b1462 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>@@ -276,10 +276,6 @@ void NetworkProcess::initializeNetworkProcess(NetworkProcessCreationParameters&&
> 
>     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();
> 
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>index cd7dba8e9a358c378fa955ecdfc3233f5a99304a..72af4dc19db1237fd24cdbcb9f6555c6e5653164 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 << privateBrowsingEnabled;
>     encoder.encodeEnum(cacheModel);
>     encoder << diskCacheSizeOverride;
>     encoder << canHandleHTTPSServerTrustEvaluation;
>@@ -112,8 +111,6 @@ void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
> 
> 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))
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>index 54e6ab04c643e2ade0d44b5dea4fdf91feece7ed..62e86ea02bfb4bf3591c579552a9f775c2e16923 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&);
> 
>-    bool privateBrowsingEnabled { false };
>     CacheModel cacheModel { CacheModelDocumentViewer };
>     int64_t diskCacheSizeOverride { -1 };
>     bool canHandleHTTPSServerTrustEvaluation { true };
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
>index 965d30b7df416e75c113b325ef9f753c9c1a98d4..a56102d8b301a8c4529566bad1a0f5d1b9b3307c 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.cpp
>+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
>@@ -495,8 +495,6 @@ NetworkProcessProxy& WebProcessPool::ensureNetworkProcess(WebsiteDataStore* with
>         m_websiteDataStore->websiteDataStore().clearPendingCookies();
>     }
> 
>-    parameters.privateBrowsingEnabled = WebPreferences::anyPagesAreUsingPrivateBrowsing();
>-
>     parameters.cacheModel = cacheModel();
>     parameters.diskCacheSizeOverride = m_configuration->diskCacheSizeOverride();
>     parameters.canHandleHTTPSServerTrustEvaluation = m_canHandleHTTPSServerTrustEvaluation;
>@@ -561,6 +559,9 @@ NetworkProcessProxy& WebProcessPool::ensureNetworkProcess(WebsiteDataStore* with
>         withWebsiteDataStore->clearPendingCookies();
>     }
> 
>+    if (WebPreferences::anyPagesAreUsingPrivateBrowsing())
>+        sendToNetworkingProcess(Messages::NetworkProcess::AddWebsiteDataStore(WebsiteDataStoreParameters::legacyPrivateSessionParameters()));
>+
>     return *m_networkProcess;
> }
>

Flags:

achristensen: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 188863: 347844