Attachment 360747 Details for Bug 194103 – Patch

[patch] Patch

bug-194103-20190131134854.patch (text/plain), 10.93 KB, created by Michael Catanzaro on 2019-01-31 11:48:55 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2019-01-31 11:48:55 PST

Size: 10.93 KB

patch

obsolete

>Subversion Revision: 240793
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index dd09e1bcd77c13904f0edef65253f119395e0a05..99cca0f91b79d97ecb6db6a18158f48ee31839e5 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,28 @@
>+2019-01-31  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [SOUP] Improve use of SoupCookiePersistentStorageType
>+        https://bugs.webkit.org/show_bug.cgi?id=194103
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Turn it into an enum class, and stop casting it to and from uint32_t.
>+
>+        * NetworkProcess/Cookies/WebCookieManager.h:
>+        * NetworkProcess/Cookies/WebCookieManager.messages.in:
>+        * NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp:
>+        (WebKit::WebCookieManager::setCookiePersistentStorage):
>+        * NetworkProcess/NetworkSessionCreationParameters.cpp:
>+        (WebKit::NetworkSessionCreationParameters::privateSessionParameters):
>+        (WebKit::NetworkSessionCreationParameters::decode):
>+        * NetworkProcess/NetworkSessionCreationParameters.h:
>+        * Shared/soup/SoupCookiePersistentStorageType.h:
>+        (): Deleted.
>+        * UIProcess/API/glib/WebKitCookieManager.cpp:
>+        * UIProcess/WebCookieManagerProxy.h:
>+        * UIProcess/soup/WebCookieManagerProxySoup.cpp:
>+        (WebKit::WebCookieManagerProxy::setCookiePersistentStorage):
>+        (WebKit::WebCookieManagerProxy::getCookiePersistentStorage const):
>+
> 2019-01-30  Simon Fraser  <simon.fraser@apple.com>
> 
>         [Mac] Implement basic hit testing in the scrolling tree
>diff --git a/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.h b/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.h
>index 3156466807c9c9e2854474e2ee334aa336e27699..3639eab6cf12ae4ba2b01a56ccb9223e9e78c5a0 100644
>--- a/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.h
>+++ b/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.h
>@@ -58,7 +58,7 @@ public:
>     void setHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy, OptionalCallbackID);
> 
> #if USE(SOUP)
>-    void setCookiePersistentStorage(PAL::SessionID, const String& storagePath, uint32_t storageType);
>+    void setCookiePersistentStorage(PAL::SessionID, const String& storagePath, SoupCookiePersistentStorageType);
> #endif
> 
>     void notifyCookiesDidChange(PAL::SessionID);
>diff --git a/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.messages.in b/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.messages.in
>index 2ee06ad4ac9404b19d1ae9fadeb7184e1ea57731..28f87b6ae4d03480dbb407035b136e3730b54bf5 100644
>--- a/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.messages.in
>+++ b/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.messages.in
>@@ -42,6 +42,6 @@
>     void StopObservingCookieChanges(PAL::SessionID sessionID)
> 
> #if USE(SOUP)
>-    SetCookiePersistentStorage(PAL::SessionID sessionID, String storagePath, uint32_t storageType)
>+    void SetCookiePersistentStorage(PAL::SessionID sessionID, String storagePath, enum:bool WebKit::SoupCookiePersistentStorageType storageType)
> #endif
> }
>diff --git a/Source/WebKit/NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp b/Source/WebKit/NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp
>index 6898c7f34d6f78658bafdb913106a392399c8987..b85c9ae6ba3ad35787908bb8ef101693926994a8 100644
>--- a/Source/WebKit/NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp
>+++ b/Source/WebKit/NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp
>@@ -27,6 +27,7 @@
> #include "WebCookieManager.h"
> 
> #include "NetworkProcess.h"
>+#include "SoupCookiePersistentStorageType.h"
> #include <WebCore/NetworkStorageSession.h>
> #include <WebCore/SoupNetworkSession.h>
> #include <libsoup/soup.h>
>@@ -71,14 +72,14 @@ HTTPCookieAcceptPolicy WebCookieManager::platformGetHTTPCookieAcceptPolicy()
>     return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
> }
> 
>-void WebCookieManager::setCookiePersistentStorage(PAL::SessionID sessionID, const String& storagePath, uint32_t storageType)
>+void WebCookieManager::setCookiePersistentStorage(PAL::SessionID sessionID, const String& storagePath, SoupCookiePersistentStorageType storageType)
> {
>     GRefPtr<SoupCookieJar> jar;
>     switch (storageType) {
>-    case SoupCookiePersistentStorageText:
>+    case SoupCookiePersistentStorageType::Text:
>         jar = adoptGRef(soup_cookie_jar_text_new(storagePath.utf8().data(), FALSE));
>         break;
>-    case SoupCookiePersistentStorageSQLite:
>+    case SoupCookiePersistentStorageType::SQLite:
>         jar = adoptGRef(soup_cookie_jar_db_new(storagePath.utf8().data(), FALSE));
>         break;
>     default:
>diff --git a/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp b/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp
>index cfc9e10bbcf170b1c85386664c8c0f46de0e7fc5..6f5aa55ce40891ea8e582ceb9f5a78f5c6899a72 100644
>--- a/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp
>@@ -45,7 +45,7 @@ NetworkSessionCreationParameters NetworkSessionCreationParameters::privateSessio
>         , { }, { }, { }, false, { }, { }, { }
> #endif
> #if USE(SOUP)
>-        , { }, 0
>+        , { }, SoupCookiePersistentStorageType::Text
> #endif
> #if USE(CURL)
>         , { }, { }
>@@ -139,7 +139,7 @@ Optional<NetworkSessionCreationParameters> NetworkSessionCreationParameters::dec
>     if (!cookiePersistentStoragePath)
>         return WTF::nullopt;
> 
>-    Optional<uint32_t> cookiePersistentStorageType;
>+    Optional<SoupCookiePersistentStorageType> cookiePersistentStorageType;
>     decoder >> cookiePersistentStorageType;
>     if (!cookiePersistentStorageType)
>         return WTF::nullopt;
>diff --git a/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h b/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h
>index cd5cae231b12a0f8dcce49c7fb1e59f36b321a57..4fc7361ef6f776b717e7128b691ba53c35968196 100644
>--- a/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h
>+++ b/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h
>@@ -31,6 +31,10 @@
> #include <wtf/URL.h>
> #include <wtf/text/WTFString.h>
> 
>+#if USE(SOUP)
>+#include "SoupCookiePersistentStorageType.h"
>+#endif
>+
> #if USE(CURL)
> #include <WebCore/CurlProxySettings.h>
> #endif
>@@ -48,7 +52,7 @@ extern "C" CFStringRef const WebKit2HTTPSProxyDefaultsKey;
> namespace WebKit {
> 
> enum class AllowsCellularAccess : bool { No, Yes };
>-    
>+
> struct NetworkSessionCreationParameters {
>     void encode(IPC::Encoder&) const;
>     static Optional<NetworkSessionCreationParameters> decode(IPC::Decoder&);
>@@ -68,7 +72,7 @@ struct NetworkSessionCreationParameters {
> #endif
> #if USE(SOUP)
>     String cookiePersistentStoragePath;
>-    uint32_t cookiePersistentStorageType { 0 };
>+    SoupCookiePersistentStorageType cookiePersistentStorageType { SoupCookiePersistentStorageType::Text };
> #endif
> #if USE(CURL)
>     String cookiePersistentStorageFile;
>diff --git a/Source/WebKit/Shared/soup/SoupCookiePersistentStorageType.h b/Source/WebKit/Shared/soup/SoupCookiePersistentStorageType.h
>index 9fc1c3cd319ff127c17cd0284fb3d32082baa5cd..95e4f309f7d0f39ee73574f3c8be487fae34911c 100644
>--- a/Source/WebKit/Shared/soup/SoupCookiePersistentStorageType.h
>+++ b/Source/WebKit/Shared/soup/SoupCookiePersistentStorageType.h
>@@ -23,16 +23,13 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#ifndef SoupCookiePersistentStorageType_h
>-#define SoupCookiePersistentStorageType_h
>+#pragma once
> 
> namespace WebKit {
> 
>-enum SoupCookiePersistentStorageType {
>-    SoupCookiePersistentStorageText,
>-    SoupCookiePersistentStorageSQLite
>+enum class SoupCookiePersistentStorageType : bool {
>+    Text,
>+    SQLite
> };
> 
> } // namespace WebKit
>-
>-#endif // SoupCookiePersistentStorageType_h
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp b/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp
>index 01e1a3eda83df0bd8bbdbdf7f6a64e0266329cd7..578cf04aacd2a26137a8ad67dff43891d5046fdc 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp
>@@ -73,12 +73,12 @@ static inline SoupCookiePersistentStorageType toSoupCookiePersistentStorageType(
> {
>     switch (kitStorage) {
>     case WEBKIT_COOKIE_PERSISTENT_STORAGE_TEXT:
>-        return SoupCookiePersistentStorageText;
>+        return SoupCookiePersistentStorageType::Text;
>     case WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE:
>-        return SoupCookiePersistentStorageSQLite;
>+        return SoupCookiePersistentStorageType::SQLite;
>     default:
>         ASSERT_NOT_REACHED();
>-        return SoupCookiePersistentStorageText;
>+        return SoupCookiePersistentStorageType::Text;
>     }
> }
> 
>diff --git a/Source/WebKit/UIProcess/WebCookieManagerProxy.h b/Source/WebKit/UIProcess/WebCookieManagerProxy.h
>index e7f2e20153c3627825113ea0fb88d978dac8529b..dbff28a5cd11683d4849485668581e68f200a12b 100644
>--- a/Source/WebKit/UIProcess/WebCookieManagerProxy.h
>+++ b/Source/WebKit/UIProcess/WebCookieManagerProxy.h
>@@ -98,8 +98,8 @@ public:
>     void unregisterObserver(PAL::SessionID, Observer&);
> 
> #if USE(SOUP)
>-    void setCookiePersistentStorage(PAL::SessionID, const String& storagePath, uint32_t storageType);
>-    void getCookiePersistentStorage(PAL::SessionID, String& storagePath, uint32_t& storageType) const;
>+    void setCookiePersistentStorage(PAL::SessionID, const String& storagePath, SoupCookiePersistentStorageType);
>+    void getCookiePersistentStorage(PAL::SessionID, String& storagePath, SoupCookiePersistentStorageType&) const;
> #endif
> 
>     using API::Object::ref;
>diff --git a/Source/WebKit/UIProcess/soup/WebCookieManagerProxySoup.cpp b/Source/WebKit/UIProcess/soup/WebCookieManagerProxySoup.cpp
>index 06ea26d5115f3cf11ebf0056a012701f822c3ee7..9f7be3c941b6cd0a1b94cb136098f3a041ceff99 100644
>--- a/Source/WebKit/UIProcess/soup/WebCookieManagerProxySoup.cpp
>+++ b/Source/WebKit/UIProcess/soup/WebCookieManagerProxySoup.cpp
>@@ -31,17 +31,17 @@
> 
> namespace WebKit {
> 
>-void WebCookieManagerProxy::setCookiePersistentStorage(PAL::SessionID sessionID, const String& storagePath, uint32_t storageType)
>+void WebCookieManagerProxy::setCookiePersistentStorage(PAL::SessionID sessionID, const String& storagePath, SoupCookiePersistentStorageType storageType)
> {
>-    m_cookiePersistentStorageMap.set(sessionID, std::make_pair(storagePath, static_cast<SoupCookiePersistentStorageType>(storageType)));
>+    m_cookiePersistentStorageMap.set(sessionID, std::make_pair(storagePath, storageType));
>     processPool()->sendToNetworkingProcess(Messages::WebCookieManager::SetCookiePersistentStorage(sessionID, storagePath, storageType));
> }
> 
>-void WebCookieManagerProxy::getCookiePersistentStorage(PAL::SessionID sessionID, String& storagePath, uint32_t& storageType) const
>+void WebCookieManagerProxy::getCookiePersistentStorage(PAL::SessionID sessionID, String& storagePath, SoupCookiePersistentStorageType& storageType) const
> {
>     auto pair = m_cookiePersistentStorageMap.get(sessionID);
>     storagePath = pair.first;
>-    storageType = static_cast<uint32_t>(pair.second);
>+    storageType = pair.second;
> }
> 
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 194103: 360747