Diff
Modified: trunk/Source/WebKit/ChangeLog (240857 => 240858)
--- trunk/Source/WebKit/ChangeLog 2019-02-01 17:47:10 UTC (rev 240857)
+++ trunk/Source/WebKit/ChangeLog 2019-02-01 17:49:10 UTC (rev 240858)
@@ -1,3 +1,28 @@
+2019-02-01 Michael Catanzaro <mcatanz...@igalia.com>
+
+ [SOUP] Improve use of SoupCookiePersistentStorageType
+ https://bugs.webkit.org/show_bug.cgi?id=194103
+
+ Reviewed by Carlos Garcia Campos.
+
+ 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-02-01 Per Arne Vollan <pvol...@apple.com>
[macOS] Revert parts of r240811, since it causes kernel panics.
Modified: trunk/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.h (240857 => 240858)
--- trunk/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.h 2019-02-01 17:47:10 UTC (rev 240857)
+++ trunk/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.h 2019-02-01 17:49:10 UTC (rev 240858)
@@ -58,7 +58,7 @@
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);
Modified: trunk/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.messages.in (240857 => 240858)
--- trunk/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.messages.in 2019-02-01 17:47:10 UTC (rev 240857)
+++ trunk/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.messages.in 2019-02-01 17:49:10 UTC (rev 240858)
@@ -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
}
Modified: trunk/Source/WebKit/NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp (240857 => 240858)
--- trunk/Source/WebKit/NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp 2019-02-01 17:47:10 UTC (rev 240857)
+++ trunk/Source/WebKit/NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp 2019-02-01 17:49:10 UTC (rev 240858)
@@ -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 @@
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:
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp (240857 => 240858)
--- trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp 2019-02-01 17:47:10 UTC (rev 240857)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp 2019-02-01 17:49:10 UTC (rev 240858)
@@ -45,7 +45,7 @@
, { }, { }, { }, false, { }, { }, { }
#endif
#if USE(SOUP)
- , { }, 0
+ , { }, SoupCookiePersistentStorageType::Text
#endif
#if USE(CURL)
, { }, { }
@@ -139,7 +139,7 @@
if (!cookiePersistentStoragePath)
return WTF::nullopt;
- Optional<uint32_t> cookiePersistentStorageType;
+ Optional<SoupCookiePersistentStorageType> cookiePersistentStorageType;
decoder >> cookiePersistentStorageType;
if (!cookiePersistentStorageType)
return WTF::nullopt;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h (240857 => 240858)
--- trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h 2019-02-01 17:47:10 UTC (rev 240857)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h 2019-02-01 17:49:10 UTC (rev 240858)
@@ -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 @@
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 @@
#endif
#if USE(SOUP)
String cookiePersistentStoragePath;
- uint32_t cookiePersistentStorageType { 0 };
+ SoupCookiePersistentStorageType cookiePersistentStorageType { SoupCookiePersistentStorageType::Text };
#endif
#if USE(CURL)
String cookiePersistentStorageFile;
Modified: trunk/Source/WebKit/Shared/soup/SoupCookiePersistentStorageType.h (240857 => 240858)
--- trunk/Source/WebKit/Shared/soup/SoupCookiePersistentStorageType.h 2019-02-01 17:47:10 UTC (rev 240857)
+++ trunk/Source/WebKit/Shared/soup/SoupCookiePersistentStorageType.h 2019-02-01 17:49:10 UTC (rev 240858)
@@ -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
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp (240857 => 240858)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp 2019-02-01 17:47:10 UTC (rev 240857)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp 2019-02-01 17:49:10 UTC (rev 240858)
@@ -78,12 +78,12 @@
{
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;
}
}
Modified: trunk/Source/WebKit/UIProcess/WebCookieManagerProxy.h (240857 => 240858)
--- trunk/Source/WebKit/UIProcess/WebCookieManagerProxy.h 2019-02-01 17:47:10 UTC (rev 240857)
+++ trunk/Source/WebKit/UIProcess/WebCookieManagerProxy.h 2019-02-01 17:49:10 UTC (rev 240858)
@@ -98,8 +98,8 @@
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;
Modified: trunk/Source/WebKit/UIProcess/soup/WebCookieManagerProxySoup.cpp (240857 => 240858)
--- trunk/Source/WebKit/UIProcess/soup/WebCookieManagerProxySoup.cpp 2019-02-01 17:47:10 UTC (rev 240857)
+++ trunk/Source/WebKit/UIProcess/soup/WebCookieManagerProxySoup.cpp 2019-02-01 17:49:10 UTC (rev 240858)
@@ -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;
}
}
