Attachment 358051 Details for Bug 192970 – WIP Patch

[patch] WIP Patch

bug-192970-20181225125414.patch (text/plain), 9.44 KB, created by Fujii Hironori on 2018-12-24 19:54:15 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-12-24 19:54:15 PST

Size: 9.44 KB

patch

obsolete

>Subversion Revision: 239550
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 9953c891b096f4757a281467b7e7b315ccba7707..3fefef04ca9162d6108b32d5a99b42632a764714 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,29 @@
>+2018-12-24  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!).
>+
>+        * 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.
>+
>+        * NetworkProcess/Cookies/WebCookieManager.h: Removed setCookiePersistentStorage method of curl port extension.
>+        * NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp:
>+        (WebKit::WebCookieManager::setCookiePersistentStorage): Deleted.
>+
> 2018-12-24  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         [WebKit][Win] Remove using namespace in the global scope
>diff --git a/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.h b/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.h
>index 3210e3299e6fcb832fc39c8ed6ca8e6678bc6bc3..523fdbe893fb70360bff4f80ff338bb2aca2b6ca 100644
>--- a/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.h
>+++ b/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.h
>@@ -59,8 +59,6 @@ public:
> 
> #if USE(SOUP)
>     void setCookiePersistentStorage(const String& storagePath, uint32_t storageType);
>-#elif USE(CURL)
>-    void setCookiePersistentStorage(const String& storagePath);
> #endif
> 
>     void notifyCookiesDidChange(PAL::SessionID);
>diff --git a/Source/WebKit/NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp b/Source/WebKit/NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp
>index f373e1a0a9164f13bdd8eb789e8df0de6cbbd5cc..eb6bff1fcae02bc50da7be5a4bc091cf67dc9b27 100644
>--- a/Source/WebKit/NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp
>+++ b/Source/WebKit/NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp
>@@ -26,11 +26,6 @@
> #include "config.h"
> #include "WebCookieManager.h"
> 
>-#include "ChildProcess.h"
>-#include <WebCore/CookieJarDB.h>
>-#include <WebCore/NetworkStorageSession.h>
>-#include <wtf/text/CString.h>
>-
> namespace WebKit {
> 
> using namespace WebCore;
>@@ -44,10 +39,4 @@ HTTPCookieAcceptPolicy WebCookieManager::platformGetHTTPCookieAcceptPolicy()
>     return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
> }
> 
>-void WebCookieManager::setCookiePersistentStorage(const String& storagePath)
>-{
>-    auto& storageSession = NetworkStorageSession::defaultStorageSession();
>-    storageSession.setCookieDatabase(makeUniqueRef<CookieJarDB>(storagePath));
>-}
>-
> } // namespace WebKit
>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 28afa8d7cfd5e8eae758b30e25e625dc4c75e07b..79ae1b51572bbfe097d9403314f1b5c621ff3f3e 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 @@ namespace WebKit {
> 
> using namespace WebCore;
> 
>-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 781eb42dbb503167ed6565dc38f4ec00cbab7eb0..e7d77bc4e0ed6b35d4d34052be3b54b737aed336 100644
>--- a/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp
>+++ b/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp
>@@ -26,7 +26,10 @@
> #include "config.h"
> #include "NetworkSessionCurl.h"
> 
>+#include "NetworkProcess.h"
> #include "NetworkSessionCreationParameters.h"
>+#include "WebCookieManager.h"
>+#include <WebCore/CookieJarDB.h>
> #include <WebCore/CurlContext.h>
> #include <WebCore/NetworkStorageSession.h>
> 
>@@ -37,6 +40,8 @@ using namespace WebCore;
> NetworkSessionCurl::NetworkSessionCurl(NetworkSessionCreationParameters&& parameters)
>     : NetworkSession(parameters.sessionID)
> {
>+    if (!parameters.cookiePersistentStorageFile.isEmpty())
>+        networkStorageSession().setCookieDatabase(makeUniqueRef<CookieJarDB>(parameters.cookiePersistentStorageFile));
>     networkStorageSession().setProxySettings(WTFMove(parameters.proxySettings));
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 192970: 357921 | 358051