Attachment 357921 Details for Bug 192970 – Patch

[patch] Patch

bug-192970-20181221130044.patch (text/plain), 7.59 KB, created by Fujii Hironori on 2018-12-20 20:00:45 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-12-20 20:00:45 PST

Size: 7.59 KB

patch

obsolete

>Subversion Revision: 239495
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 5c3ec33f3f7635b3164e62b8c7d99388f76e1e16..fa569085b9f7a13fe13afb16f2a3e1eac8cae274 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,27 @@
>+2018-12-20  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [curl] Move cookiePersistentStorageFile from NetworkProcessCreationParameters to NetworkSessionCreationParameters
>+        https://bugs.webkit.org/show_bug.cgi?id=192970
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This cookiePersistentStorageFile is not used at the moment. No test is needed.
>+
>+        * NetworkProcess/NetworkProcessCreationParameters.cpp:
>+        (WebKit::NetworkProcessCreationParameters::encode const): Removed code for cookiePersistentStorageFile.
>+        (WebKit::NetworkProcessCreationParameters::decode): Ditto.
>+        * NetworkProcess/NetworkProcessCreationParameters.h: Ditto.
>+        * NetworkProcess/curl/NetworkProcessCurl.cpp:
>+        (WebKit::NetworkProcess::platformInitializeNetworkProcess): Ditto.
>+
>+        * NetworkProcess/NetworkSessionCreationParameters.cpp:
>+        (WebKit::NetworkSessionCreationParameters::privateSessionParameters): Added code for cookiePersistentStorageFile.
>+        (WebKit::NetworkSessionCreationParameters::encode const): Ditto.
>+        (WebKit::NetworkSessionCreationParameters::decode): Ditto.
>+        * NetworkProcess/NetworkSessionCreationParameters.h: Ditto.
>+        * NetworkProcess/curl/NetworkSessionCurl.cpp:
>+        (WebKit::NetworkSessionCurl::NetworkSessionCurl): Ditto.
>+
> 2018-12-20  Alex Christensen  <achristensen@webkit.org>
> 
>         Remove unused NetworkProcessCreationParameters
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>index c375ff9422f77b1b94c84e9b9627886037cd6430..1ae60bc8b7ef266151981a0ec3a0d791d5aef93e 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>@@ -83,8 +83,6 @@ void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
>     encoder << ignoreTLSErrors;
>     encoder << languages;
>     encoder << proxySettings;
>-#elif USE(CURL)
>-    encoder << cookiePersistentStorageFile;
> #endif
> 
>     encoder << urlSchemesRegisteredAsSecure;
>@@ -203,9 +201,6 @@ bool NetworkProcessCreationParameters::decode(IPC::Decoder& decoder, NetworkProc
>         return false;
>     if (!decoder.decode(result.proxySettings))
>         return false;
>-#elif USE(CURL)
>-    if (!decoder.decode(result.cookiePersistentStorageFile))
>-        return false;
> #endif
> 
>     if (!decoder.decode(result.urlSchemesRegisteredAsSecure))
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>index 7f9c05f5f72f025a98ee262e0aad99ee66a96fdf..5d7be3bd084e2a3710d81cbda18e100ad01e2871 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>+++ b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>@@ -96,8 +96,6 @@ struct NetworkProcessCreationParameters {
>     bool ignoreTLSErrors { false };
>     Vector<String> languages;
>     WebCore::SoupNetworkProxySettings proxySettings;
>-#elif USE(CURL)
>-    String cookiePersistentStorageFile;
> #endif
> 
>     Vector<String> urlSchemesRegisteredAsSecure;
>diff --git a/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp b/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp
>index 03795a2c84e5e2a362ac51fa1d574ced4092bf5f..5d6454c37546688912d33023f1fd9afc82368d0e 100644
>--- a/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp
>@@ -45,7 +45,7 @@ NetworkSessionCreationParameters NetworkSessionCreationParameters::privateSessio
>         , { }, { }, { }, false, { }, { }, { }
> #endif
> #if USE(CURL)
>-        , { }
>+        , { }, { }
> #endif
>     };
> }
>@@ -65,6 +65,7 @@ void NetworkSessionCreationParameters::encode(IPC::Encoder& encoder) const
>     encoder << httpsProxy;
> #endif
> #if USE(CURL)
>+    encoder << cookiePersistentStorageFile;
>     encoder << proxySettings;
> #endif
> }
>@@ -122,6 +123,11 @@ Optional<NetworkSessionCreationParameters> NetworkSessionCreationParameters::dec
> #endif
>     
> #if USE(CURL)
>+    Optional<String> cookiePersistentStorageFile;
>+    decoder >> cookiePersistentStorageFile;
>+    if (!cookiePersistentStorageFile)
>+        return WTF::nullopt;
>+
>     Optional<WebCore::CurlProxySettings> proxySettings;
>     decoder >> proxySettings;
>     if (!proxySettings)
>@@ -142,6 +148,7 @@ Optional<NetworkSessionCreationParameters> NetworkSessionCreationParameters::dec
>         , WTFMove(*httpsProxy)
> #endif
> #if USE(CURL)
>+        , WTFMove(*cookiePersistentStorageFile)
>         , WTFMove(*proxySettings)
> #endif
>     }};
>diff --git a/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h b/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h
>index 0df22bfd008ef0d9c6aafac068d34016aab48744..09af3332313ceb718b4ff04d3016331911c94370 100644
>--- a/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h
>+++ b/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h
>@@ -66,6 +66,7 @@ struct NetworkSessionCreationParameters {
>     URL httpsProxy;
> #endif
> #if USE(CURL)
>+    String cookiePersistentStorageFile;
>     WebCore::CurlProxySettings proxySettings;
> #endif
> };
>diff --git a/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp
>index e7a3b47c9b16e1d9004aad922554cecf99f9a254..a042c0e53752efb0b7b452f175c987d60d4a4b3e 100644
>--- a/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp
>+++ b/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp
>@@ -27,7 +27,6 @@
> #include "NetworkProcess.h"
> 
> #include "NetworkProcessCreationParameters.h"
>-#include "WebCookieManager.h"
> #include <WebCore/CurlContext.h>
> #include <WebCore/NetworkStorageSession.h>
> #include <WebCore/NotImplemented.h>
>@@ -36,10 +35,8 @@ using namespace WebCore;
> 
> namespace WebKit {
> 
>-void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters& parameters)
>+void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters&)
> {
>-    if (!parameters.cookiePersistentStorageFile.isEmpty())
>-        supplement<WebCookieManager>()->setCookiePersistentStorage(parameters.cookiePersistentStorageFile);
> }
> 
> void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host)
>diff --git a/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp
>index fa68b6eb7cac10c4a9a8a27cfe13d5d3fb8b6ddf..fbc075b7cc0f1a18d6f15aaac5860fa576b61f18 100644
>--- a/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp
>+++ b/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp
>@@ -26,7 +26,9 @@
> #include "config.h"
> #include "NetworkSessionCurl.h"
> 
>+#include "NetworkProcess.h"
> #include "NetworkSessionCreationParameters.h"
>+#include "WebCookieManager.h"
> #include <WebCore/CurlContext.h>
> #include <WebCore/NetworkStorageSession.h>
> 
>@@ -37,6 +39,8 @@ namespace WebKit {
> NetworkSessionCurl::NetworkSessionCurl(NetworkSessionCreationParameters&& parameters)
>     : NetworkSession(parameters.sessionID)
> {
>+    if (!parameters.cookiePersistentStorageFile.isEmpty())
>+        NetworkProcess::singleton().supplement<WebCookieManager>()->setCookiePersistentStorage(parameters.cookiePersistentStorageFile);
>     networkStorageSession().setProxySettings(WTFMove(parameters.proxySettings));
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 192970: 357921 | 358051