Changeset 219295 in webkit


Ignore:
Timestamp:
Jul 10, 2017 9:23:19 AM (7 years ago)
Author:
Michael Catanzaro
Message:

[SOUP] Remove WebKitSoupCookieJarSqlite
https://bugs.webkit.org/show_bug.cgi?id=174310

Reviewed by Carlos Garcia Campos.

It seems WebKitSoupCookieJarSqlite uses exactly the same database format as the upstream
SoupCookieJarDb class. WebKitSoupCookieJarSqlite is a copy of SoupCookieJarSqlite that uses
WebCore's SQLite wrapper and WTF stuff. WebKitSoupCookieJarSqlite exists only because
SoupCookieJarDb is relatively new, and the older SoupCookieJarSqlite class existed only in
libsoup-gnome rather than libsoup proper. The advantage of continuing to use our
WebKitSoupCookieJarSqlite class, besides that we already know it works, is that it utilizes
the same SQLiteDatabase class that is used elsewhere in WebKit. But that's not really any
reason to keep the class around, when SoupCookieJarDb does exactly the same thing. It was
introduced in libsoup 2.42 and that is already our minimum required version, so we can
switch now.

This passes a quick sanity-check of Epiphany's cookies dialog and also TestCookieManager.

  • PlatformGTK.cmake:
  • PlatformWPE.cmake:
  • WebProcess/Cookies/soup/WebCookieManagerSoup.cpp:

(WebKit::WebCookieManager::setCookiePersistentStorage):

  • WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp: Removed.
  • WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.h: Removed.
Location:
trunk/Source/WebKit2
Files:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r219293 r219295  
     12017-07-10  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [SOUP] Remove WebKitSoupCookieJarSqlite
     4        https://bugs.webkit.org/show_bug.cgi?id=174310
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        It seems WebKitSoupCookieJarSqlite uses exactly the same database format as the upstream
     9        SoupCookieJarDb class. WebKitSoupCookieJarSqlite is a copy of SoupCookieJarSqlite that uses
     10        WebCore's SQLite wrapper and WTF stuff. WebKitSoupCookieJarSqlite exists only because
     11        SoupCookieJarDb is relatively new, and the older SoupCookieJarSqlite class existed only in
     12        libsoup-gnome rather than libsoup proper. The advantage of continuing to use our
     13        WebKitSoupCookieJarSqlite class, besides that we already know it works, is that it utilizes
     14        the same SQLiteDatabase class that is used elsewhere in WebKit. But that's not really any
     15        reason to keep the class around, when SoupCookieJarDb does exactly the same thing. It was
     16        introduced in libsoup 2.42 and that is already our minimum required version, so we can
     17        switch now.
     18
     19        This passes a quick sanity-check of Epiphany's cookies dialog and also TestCookieManager.
     20
     21        * PlatformGTK.cmake:
     22        * PlatformWPE.cmake:
     23        * WebProcess/Cookies/soup/WebCookieManagerSoup.cpp:
     24        (WebKit::WebCookieManager::setCookiePersistentStorage):
     25        * WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp: Removed.
     26        * WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.h: Removed.
     27
    1282017-07-10  Myles C. Maxfield  <mmaxfield@apple.com>
    229
  • trunk/Source/WebKit2/PlatformGTK.cmake

    r219049 r219295  
    240240
    241241    WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
    242     WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp
    243242
    244243    WebProcess/InjectedBundle/API/glib/WebKitConsoleMessage.cpp
  • trunk/Source/WebKit2/PlatformWPE.cmake

    r219049 r219295  
    223223
    224224    WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
    225     WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp
    226225
    227226    WebProcess/InjectedBundle/API/glib/WebKitConsoleMessage.cpp
  • trunk/Source/WebKit2/WebProcess/Cookies/soup/WebCookieManagerSoup.cpp

    r212626 r219295  
    2828
    2929#include "ChildProcess.h"
    30 #include "WebKitSoupCookieJarSqlite.h"
    3130#include <WebCore/NetworkStorageSession.h>
    3231#include <WebCore/SoupNetworkSession.h>
     
    8281        break;
    8382    case SoupCookiePersistentStorageSQLite:
    84         jar = adoptGRef(webkitSoupCookieJarSqliteNew(storagePath));
     83        jar = adoptGRef(soup_cookie_jar_db_new(storagePath.utf8().data(), FALSE));
    8584        break;
    8685    default:
Note: See TracChangeset for help on using the changeset viewer.