webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

2 files changed, 35 insertions, 30 deletions

diff --git a/Source/WebKit2/WebProcess/Cookies/soup/WebCookieManagerSoup.cpp b/Source/WebKit2/WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
index 3e7b46a09..7d00d29eb 100644
--- a/Source/WebKit2/WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
+++ b/Source/WebKit2/WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
@@ -27,12 +27,11 @@
 #include "WebCookieManager.h"
 
 #include "ChildProcess.h"
-#include "WebFrameNetworkingContext.h"
 #include "WebKitSoupCookieJarSqlite.h"
-#include <WebCore/CookieJarSoup.h>
+#include <WebCore/NetworkStorageSession.h>
 #include <WebCore/SoupNetworkSession.h>
 #include <libsoup/soup.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebCore;
@@ -41,31 +40,37 @@ namespace WebKit {
 
 void WebCookieManager::platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy)
 {
-    WebFrameNetworkingContext::setCookieAcceptPolicyForAllContexts(policy);
+    SoupCookieJarAcceptPolicy soupPolicy = SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY;
+    switch (policy) {
+    case HTTPCookieAcceptPolicyAlways:
+        soupPolicy = SOUP_COOKIE_JAR_ACCEPT_ALWAYS;
+        break;
+    case HTTPCookieAcceptPolicyNever:
+        soupPolicy = SOUP_COOKIE_JAR_ACCEPT_NEVER;
+        break;
+    case HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
+        soupPolicy = SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY;
+        break;
+    }
+
+    NetworkStorageSession::forEach([soupPolicy] (const NetworkStorageSession& session) {
+        soup_cookie_jar_set_accept_policy(session.cookieStorage(), soupPolicy);
+    });
 }
 
 HTTPCookieAcceptPolicy WebCookieManager::platformGetHTTPCookieAcceptPolicy()
 {
-    SoupCookieJar* cookieJar = WebCore::soupCookieJar();
-    SoupCookieJarAcceptPolicy soupPolicy;
-
-    HTTPCookieAcceptPolicy policy;
-
-    soupPolicy = soup_cookie_jar_get_accept_policy(cookieJar);
-    switch (soupPolicy) {
+    switch (soup_cookie_jar_get_accept_policy(NetworkStorageSession::defaultStorageSession().cookieStorage())) {
     case SOUP_COOKIE_JAR_ACCEPT_ALWAYS:
-        policy = HTTPCookieAcceptPolicyAlways;
-        break;
+        return HTTPCookieAcceptPolicyAlways;
     case SOUP_COOKIE_JAR_ACCEPT_NEVER:
-        policy = HTTPCookieAcceptPolicyNever;
-        break;
+        return HTTPCookieAcceptPolicyNever;
     case SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY:
-        policy = HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
-        break;
-    default:
-        policy = HTTPCookieAcceptPolicyAlways;
+        return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
     }
-    return policy;
+
+    ASSERT_NOT_REACHED();
+    return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
 }
 
 void WebCookieManager::setCookiePersistentStorage(const String& storagePath, uint32_t storageType)
@@ -82,9 +87,9 @@ void WebCookieManager::setCookiePersistentStorage(const String& storagePath, uin
         ASSERT_NOT_REACHED();
     }
 
-    soup_cookie_jar_set_accept_policy(jar.get(), soup_cookie_jar_get_accept_policy(WebCore::soupCookieJar()));
-    SoupNetworkSession::defaultSession().setCookieJar(jar.get());
-    WebCore::setSoupCookieJar(jar.get());
+    auto& storageSession = NetworkStorageSession::defaultStorageSession();
+    soup_cookie_jar_set_accept_policy(jar.get(), soup_cookie_jar_get_accept_policy(storageSession.cookieStorage()));
+    storageSession.setCookieStorage(jar.get());
 }
 
 } // namespace WebKit
diff --git a/Source/WebKit2/WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp b/Source/WebKit2/WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp
index b60584c22..369fabfaf 100644
--- a/Source/WebKit2/WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp
+++ b/Source/WebKit2/WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp
@@ -93,7 +93,7 @@ static void webkitSoupCookieJarSqliteLoad(WebKitSoupCookieJarSqlite* sqliteJar)
     WebKitSoupCookieJarSqlitePrivate* priv = sqliteJar->priv;
     priv->isLoading = true;
     SQLiteStatement query(priv->database, "SELECT id, name, value, host, path, expiry, lastAccessed, isSecure, isHttpOnly FROM moz_cookies;");
-    if (query.prepare() != SQLResultOk) {
+    if (query.prepare() != SQLITE_OK) {
         g_warning("Failed to prepare all cookies query");
         priv->isLoading = false;
         return;
@@ -102,7 +102,7 @@ static void webkitSoupCookieJarSqliteLoad(WebKitSoupCookieJarSqlite* sqliteJar)
     SoupCookieJar* jar = SOUP_COOKIE_JAR(sqliteJar);
     time_t now = floorf(currentTime());
     int result;
-    while ((result = query.step()) == SQLResultRow) {
+    while ((result = query.step()) == SQLITE_ROW) {
         int expireTime = query.getColumnInt(ColumnExpiry);
         if (now >= expireTime)
             continue;
@@ -118,7 +118,7 @@ static void webkitSoupCookieJarSqliteLoad(WebKitSoupCookieJarSqlite* sqliteJar)
         soup_cookie_jar_add_cookie(jar, cookie);
     }
 
-    if (result != SQLResultDone)
+    if (result != SQLITE_DONE)
         g_warning("Error reading cookies from database");
     priv->isLoading = false;
 }
@@ -127,7 +127,7 @@ static bool webkitSoupCookieJarSqliteInsertCookie(WebKitSoupCookieJarSqlite* sql
 {
     WebKitSoupCookieJarSqlitePrivate* priv = sqliteJar->priv;
     SQLiteStatement query(priv->database, "INSERT INTO moz_cookies VALUES(NULL, ?, ?, ?, ?, ?, NULL, ?, ?);");
-    if (query.prepare() != SQLResultOk) {
+    if (query.prepare() != SQLITE_OK) {
         g_warning("Failed to prepare insert cookies query");
         return false;
     }
@@ -139,7 +139,7 @@ static bool webkitSoupCookieJarSqliteInsertCookie(WebKitSoupCookieJarSqlite* sql
     query.bindInt(5, static_cast<int64_t>(soup_date_to_time_t(cookie->expires)));
     query.bindInt(6, cookie->secure);
     query.bindInt(7, cookie->http_only);
-    if (query.step() != SQLResultDone) {
+    if (query.step() != SQLITE_DONE) {
         g_warning("Error adding cookie (name=%s, domain=%s) to database", cookie->name, cookie->name);
         return false;
     }
@@ -151,14 +151,14 @@ static bool webkitSoupCookieJarSqliteDeleteCookie(WebKitSoupCookieJarSqlite* sql
 {
     WebKitSoupCookieJarSqlitePrivate* priv = sqliteJar->priv;
     SQLiteStatement query(priv->database, "DELETE FROM moz_cookies WHERE name = (?) AND host = (?);");
-    if (query.prepare() != SQLResultOk) {
+    if (query.prepare() != SQLITE_OK) {
         g_warning("Failed to prepare delete cookies query");
         return false;
     }
 
     query.bindText(1, String::fromUTF8(cookie->name));
     query.bindText(2, String::fromUTF8(cookie->domain));
-    if (query.step() != SQLResultDone) {
+    if (query.step() != SQLITE_DONE) {
         g_warning("Error deleting cookie (name=%s, domain=%s) from database", cookie->name, cookie->name);
         return false;
     }