Changeset 179007 in webkit


Ignore:
Timestamp:
Jan 23, 2015 6:30:21 AM (9 years ago)
Author:
Carlos Garcia Campos
Message:

[GTK] Add initial database process support
​https://bugs.webkit.org/show_bug.cgi?id=139491

Reviewed by Sergio Villar Senin.

.:

  • Source/cmake/OptionsGTK.cmake: Set WebKit2_DatabaseProcess_OUTPUT_NAME.

Source/WebCore:

  • platform/sql/SQLiteFileSystem.cpp:

(WebCore::SQLiteFileSystem::openDatabase): Use
WebCore::fileSystemRepresentation() for the database filename,
otherwise sqlite3_open() fails when the filename contains "%2E".

Source/WebKit2:

Add initial support for DatabaseProcess, disabled by default for
now.

  • CMakeLists.txt: Add required files to compilation.
  • DatabaseProcess/DatabaseProcess.cpp:

(WebKit::DatabaseProcess::createDatabaseToWebProcessConnection):
Add the unix domain sockets implementation.

  • DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp: Added.

(main):

  • DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp: Added.

(WebKit::DatabaseProcessMainUnix):

  • DatabaseProcess/unix/DatabaseProcessMainUnix.h: Added.
  • PlatformGTK.cmake: Add required files to compilation.
  • Shared/ProcessExecutablePath.h:
  • Shared/gtk/KeyedDecoder.cpp: Added.

(WebKit::KeyedDecoder::KeyedDecoder):
(WebKit::KeyedDecoder::~KeyedDecoder):
(WebKit::KeyedDecoder::buildDictionaryFromGVariant):
(WebKit::KeyedDecoder::decodeBytes):
(WebKit::KeyedDecoder::decodeBool):
(WebKit::KeyedDecoder::decodeUInt32):
(WebKit::KeyedDecoder::decodeInt32):
(WebKit::KeyedDecoder::decodeInt64):
(WebKit::KeyedDecoder::decodeFloat):
(WebKit::KeyedDecoder::decodeDouble):
(WebKit::KeyedDecoder::decodeString):
(WebKit::KeyedDecoder::beginObject):
(WebKit::KeyedDecoder::endObject):
(WebKit::KeyedDecoder::beginArray):
(WebKit::KeyedDecoder::beginArrayElement):
(WebKit::KeyedDecoder::endArrayElement):
(WebKit::KeyedDecoder::endArray):

  • Shared/gtk/KeyedDecoder.h: Added.
  • Shared/gtk/KeyedEncoder.cpp: Added.

(WebKit::KeyedEncoder::KeyedEncoder):
(WebKit::KeyedEncoder::~KeyedEncoder):
(WebKit::KeyedEncoder::encodeBytes):
(WebKit::KeyedEncoder::encodeBool):
(WebKit::KeyedEncoder::encodeUInt32):
(WebKit::KeyedEncoder::encodeInt32):
(WebKit::KeyedEncoder::encodeInt64):
(WebKit::KeyedEncoder::encodeFloat):
(WebKit::KeyedEncoder::encodeDouble):
(WebKit::KeyedEncoder::encodeString):
(WebKit::KeyedEncoder::beginObject):
(WebKit::KeyedEncoder::endObject):
(WebKit::KeyedEncoder::beginArray):
(WebKit::KeyedEncoder::beginArrayElement):
(WebKit::KeyedEncoder::endArrayElement):
(WebKit::KeyedEncoder::endArray):
(WebKit::KeyedEncoder::finishEncoding):

  • Shared/gtk/KeyedEncoder.h: Added.
  • Shared/gtk/ProcessExecutablePathGtk.cpp:

(WebKit::executablePathOfDatabaseProcess):

  • UIProcess/Databases/DatabaseProcessProxy.cpp:

(WebKit::DatabaseProcessProxy::didCreateDatabaseToWebProcessConnection):
Add the unix domain sockets implementation.

  • UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:

(WebKit::ProcessLauncher::launchProcess): Handle the
DatabaseProcess too.

  • UIProcess/gtk/WebContextGtk.cpp:

(WebKit::WebContext::platformDefaultIndexedDBDatabaseDirectory):

  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::ensureWebToDatabaseProcessConnection): Add
the unix domain sockets implementation.

Source/WTF:

Add support for using GRefPtr with GVariantBuilder.

  • wtf/gobject/GRefPtr.cpp:

(WTF::refGPtr):
(WTF::derefGPtr):

  • wtf/gobject/GRefPtr.h:
  • wtf/gobject/GTypedefs.h:
Location:
trunk
Files:
12 added
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r178954 r179007  
     12015-01-23  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Add initial database process support
     4        https://bugs.webkit.org/show_bug.cgi?id=139491
     5
     6        Reviewed by Sergio Villar Senin.
     7
     8        * Source/cmake/OptionsGTK.cmake: Set WebKit2_DatabaseProcess_OUTPUT_NAME.
     9
    1102015-01-22  Ryosuke Niwa  <rniwa@webkit.org>
    211

  • trunk/Source/WTF/ChangeLog

    r178954 r179007  
     12015-01-23  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Add initial database process support
     4        https://bugs.webkit.org/show_bug.cgi?id=139491
     5
     6        Reviewed by Sergio Villar Senin.
     7
     8        Add support for using GRefPtr with GVariantBuilder.
     9
     10        * wtf/gobject/GRefPtr.cpp:
     11        (WTF::refGPtr):
     12        (WTF::derefGPtr):
     13        * wtf/gobject/GRefPtr.h:
     14        * wtf/gobject/GTypedefs.h:
     15
    1162015-01-22  Ryosuke Niwa  <rniwa@webkit.org>
    217

  • trunk/Source/WTF/wtf/gobject/GRefPtr.cpp

    r168059 r179007  
    9090}
    9191
     92template <> GVariantBuilder* refGPtr(GVariantBuilder* ptr)
     93{
     94    if (ptr)
     95        g_variant_builder_ref(ptr);
     96    return ptr;
     97}
     98
     99template <> void derefGPtr(GVariantBuilder* ptr)
     100{
     101    if (ptr)
     102        g_variant_builder_unref(ptr);
     103}
     104
    92105template <> GSource* refGPtr(GSource* ptr)
    93106{

  • trunk/Source/WTF/wtf/gobject/GRefPtr.h

    r173765 r179007  
    226226template <> WTF_EXPORT_PRIVATE GVariant* refGPtr(GVariant* ptr);
    227227template <> WTF_EXPORT_PRIVATE void derefGPtr(GVariant* ptr);
     228template <> WTF_EXPORT_PRIVATE GVariantBuilder* refGPtr(GVariantBuilder* ptr);
     229template <> WTF_EXPORT_PRIVATE void derefGPtr(GVariantBuilder* ptr);
    228230template <> WTF_EXPORT_PRIVATE GSource* refGPtr(GSource* ptr);
    229231template <> WTF_EXPORT_PRIVATE void derefGPtr(GSource* ptr);

  • trunk/Source/WTF/wtf/gobject/GTypedefs.h

    r157918 r179007  
    6161typedef struct _GSource GSource;
    6262typedef struct _GVariant GVariant;
     63typedef struct _GVariantBuilder GVariantBuilder;
    6364typedef union _GdkEvent GdkEvent;
    6465typedef struct _GTimer GTimer;

  • trunk/Source/WebCore/ChangeLog

    r179006 r179007  
     12015-01-23  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Add initial database process support
     4        https://bugs.webkit.org/show_bug.cgi?id=139491
     5
     6        Reviewed by Sergio Villar Senin.
     7
     8        * platform/sql/SQLiteFileSystem.cpp:
     9        (WebCore::SQLiteFileSystem::openDatabase): Use
     10        WebCore::fileSystemRepresentation() for the database filename,
     11        otherwise sqlite3_open() fails when the filename contains "%2E".
     12
    1132015-01-23  Byeongha Cho  <byeongha.cho@samsung.com>
    214

  • trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp

    r162943 r179007  
    5151int SQLiteFileSystem::openDatabase(const String& filename, sqlite3** database, bool)
    5252{
    53     return sqlite3_open(filename.utf8().data(), database);
     53    return sqlite3_open(fileSystemRepresentation(filename).data(), database);
    5454}
    5555

  • trunk/Source/WebKit2/CMakeLists.txt

    r178889 r179007  
    22    "${JAVASCRIPTCORE_DIR}/llint"
    33    "${WEBKIT2_DIR}"
     4    "${WEBKIT2_DIR}/DatabaseProcess"
     5    "${WEBKIT2_DIR}/DatabaseProcess/IndexedDB"
     6    "${WEBKIT2_DIR}/DatabaseProcess/IndexedDB/sqlite"
    47    "${WEBKIT2_DIR}/NetworkProcess"
    58    "${WEBKIT2_DIR}/NetworkProcess/FileAPI"
    … …  
    1316    "${WEBKIT2_DIR}/Shared/Authentication"
    1417    "${WEBKIT2_DIR}/Shared/CoreIPCSupport"
     18    "${WEBKIT2_DIR}/Shared/Databases"
    1519    "${WEBKIT2_DIR}/Shared/Databases/IndexedDB"
    1620    "${WEBKIT2_DIR}/Shared/Downloads"
    … …  
    2731    "${WEBKIT2_DIR}/UIProcess/API/cpp"
    2832    "${WEBKIT2_DIR}/UIProcess/Authentication"
     33    "${WEBKIT2_DIR}/UIProcess/Databases"
    2934    "${WEBKIT2_DIR}/UIProcess/Downloads"
    3035    "${WEBKIT2_DIR}/UIProcess/InspectorServer"
    … …  
    150155
    151156set(WebKit2_SOURCES
     157    DatabaseProcess/DatabaseToWebProcessConnection.cpp
     158    DatabaseProcess/DatabaseProcess.cpp
     159    DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp
     160    DatabaseProcess/IndexedDB/IDBSerialization.cpp
     161    DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp
     162    DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp
     163    DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp
     164    DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.cpp
     165    DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp
     166
    152167    NetworkProcess/NetworkConnectionToWebProcess.cpp
    153168    NetworkProcess/NetworkProcess.cpp
    … …  
    198213
    199214    Shared/ActivityAssertion.cpp
     215    Shared/AsyncRequest.cpp
    200216    Shared/BlobDataFileReferenceWithSandboxExtension.cpp
    201217    Shared/CacheModel.cpp
    … …  
    228244    Shared/WebContextMenuItemData.cpp
    229245    Shared/WebCoreArgumentCoders.cpp
     246    Shared/WebCrossThreadCopier.cpp
    230247    Shared/WebEvent.cpp
    231248    Shared/WebEventConversion.cpp
    … …  
    276293
    277294    Shared/Authentication/AuthenticationManager.cpp
     295
     296    Shared/Databases/DatabaseProcessCreationParameters.cpp
     297    Shared/Databases/IndexedDB/IDBUtilities.cpp
    278298
    279299    Shared/Downloads/Download.cpp
    … …  
    417437    UIProcess/Authentication/WebProtectionSpace.cpp
    418438
     439    UIProcess/Databases/DatabaseProcessProxy.cpp
     440
    419441    UIProcess/Downloads/DownloadProxy.cpp
    420442    UIProcess/Downloads/DownloadProxyMap.cpp
    … …  
    460482    WebProcess/Databases/WebDatabaseProvider.cpp
    461483    WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp
     484    WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp
     485    WebProcess/Databases/WebToDatabaseProcessConnection.cpp
    462486
    463487    WebProcess/FileAPI/BlobRegistryProxy.cpp
    … …  
    587611
    588612set(WebKit2_MESSAGES_IN_FILES
     613    DatabaseProcess/DatabaseToWebProcessConnection.messages.in
     614    DatabaseProcess/DatabaseProcess.messages.in
     615    DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in
     616
    589617    NetworkProcess/NetworkConnectionToWebProcess.messages.in
    590618    NetworkProcess/NetworkProcess.messages.in
    … …  
    622650    UIProcess/WebVibrationProxy.messages.in
    623651
     652    UIProcess/Databases/DatabaseProcessProxy.messages.in
     653
    624654    UIProcess/Downloads/DownloadProxy.messages.in
    625655
    … …  
    641671
    642672    WebProcess/Cookies/WebCookieManager.messages.in
     673
     674    WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in
    643675
    644676    WebProcess/FullScreen/WebFullScreenManager.messages.in
    … …  
    684716set(NetworkProcess_LIBRARIES
    685717    WebKit2
     718)
     719
     720set(DatabaseProcess_LIBRARIES
     721  WebKit2
    686722)
    687723
    … …  
    768804endif ()
    769805
     806if (ENABLE_DATABASE_PROCESS)
     807    add_definitions(-DENABLE_DATABASE_PROCESS=1)
     808    add_executable(DatabaseProcess ${DatabaseProcess_SOURCES})
     809    add_webkit2_prefix_header(DatabaseProcess)
     810    target_link_libraries(DatabaseProcess ${DatabaseProcess_LIBRARIES})
     811    set_target_properties(DatabaseProcess PROPERTIES FOLDER "WebKit")
     812    install(TARGETS DatabaseProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
     813
     814    if (WebKit2_DatabaseProcess_OUTPUT_NAME)
     815        set_target_properties(DatabaseProcess PROPERTIES OUTPUT_NAME ${WebKit2_DatabaseProcess_OUTPUT_NAME})
     816    endif ()
     817endif ()
     818
    770819POPULATE_LIBRARY_VERSION(WEBKIT2)
    771820set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR})

  • trunk/Source/WebKit2/ChangeLog

    r178980 r179007  
     12015-01-23  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Add initial database process support
     4        https://bugs.webkit.org/show_bug.cgi?id=139491
     5
     6        Reviewed by Sergio Villar Senin.
     7
     8        Add initial support for DatabaseProcess, disabled by default for
     9        now.
     10
     11        * CMakeLists.txt: Add required files to compilation.
     12        * DatabaseProcess/DatabaseProcess.cpp:
     13        (WebKit::DatabaseProcess::createDatabaseToWebProcessConnection):
     14        Add the unix domain sockets implementation.
     15        * DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp: Added.
     16        (main):
     17        * DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp: Added.
     18        (WebKit::DatabaseProcessMainUnix):
     19        * DatabaseProcess/unix/DatabaseProcessMainUnix.h: Added.
     20        * PlatformGTK.cmake: Add required files to compilation.
     21        * Shared/ProcessExecutablePath.h:
     22        * Shared/gtk/KeyedDecoder.cpp: Added.
     23        (WebKit::KeyedDecoder::KeyedDecoder):
     24        (WebKit::KeyedDecoder::~KeyedDecoder):
     25        (WebKit::KeyedDecoder::buildDictionaryFromGVariant):
     26        (WebKit::KeyedDecoder::decodeBytes):
     27        (WebKit::KeyedDecoder::decodeBool):
     28        (WebKit::KeyedDecoder::decodeUInt32):
     29        (WebKit::KeyedDecoder::decodeInt32):
     30        (WebKit::KeyedDecoder::decodeInt64):
     31        (WebKit::KeyedDecoder::decodeFloat):
     32        (WebKit::KeyedDecoder::decodeDouble):
     33        (WebKit::KeyedDecoder::decodeString):
     34        (WebKit::KeyedDecoder::beginObject):
     35        (WebKit::KeyedDecoder::endObject):
     36        (WebKit::KeyedDecoder::beginArray):
     37        (WebKit::KeyedDecoder::beginArrayElement):
     38        (WebKit::KeyedDecoder::endArrayElement):
     39        (WebKit::KeyedDecoder::endArray):
     40        * Shared/gtk/KeyedDecoder.h: Added.
     41        * Shared/gtk/KeyedEncoder.cpp: Added.
     42        (WebKit::KeyedEncoder::KeyedEncoder):
     43        (WebKit::KeyedEncoder::~KeyedEncoder):
     44        (WebKit::KeyedEncoder::encodeBytes):
     45        (WebKit::KeyedEncoder::encodeBool):
     46        (WebKit::KeyedEncoder::encodeUInt32):
     47        (WebKit::KeyedEncoder::encodeInt32):
     48        (WebKit::KeyedEncoder::encodeInt64):
     49        (WebKit::KeyedEncoder::encodeFloat):
     50        (WebKit::KeyedEncoder::encodeDouble):
     51        (WebKit::KeyedEncoder::encodeString):
     52        (WebKit::KeyedEncoder::beginObject):
     53        (WebKit::KeyedEncoder::endObject):
     54        (WebKit::KeyedEncoder::beginArray):
     55        (WebKit::KeyedEncoder::beginArrayElement):
     56        (WebKit::KeyedEncoder::endArrayElement):
     57        (WebKit::KeyedEncoder::endArray):
     58        (WebKit::KeyedEncoder::finishEncoding):
     59        * Shared/gtk/KeyedEncoder.h: Added.
     60        * Shared/gtk/ProcessExecutablePathGtk.cpp:
     61        (WebKit::executablePathOfDatabaseProcess):
     62        * UIProcess/Databases/DatabaseProcessProxy.cpp:
     63        (WebKit::DatabaseProcessProxy::didCreateDatabaseToWebProcessConnection):
     64        Add the unix domain sockets implementation.
     65        * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
     66        (WebKit::ProcessLauncher::launchProcess): Handle the
     67        DatabaseProcess too.
     68        * UIProcess/gtk/WebContextGtk.cpp:
     69        (WebKit::WebContext::platformDefaultIndexedDBDatabaseDirectory):
     70        * WebProcess/WebProcess.cpp:
     71        (WebKit::WebProcess::ensureWebToDatabaseProcessConnection): Add
     72        the unix domain sockets implementation.
     73
    1742015-01-22  Benjamin Poulain  <bpoulain@apple.com>
    275

  • trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp

    r177917 r179007  
    4040#include "WebOriginDataManagerProxyMessages.h"
    4141#include <WebCore/FileSystem.h>
     42#include <WebCore/NotImplemented.h>
    4243#include <WebCore/TextEncoding.h>
    4344#include <wtf/MainThread.h>
    … …  
    189190    IPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
    190191    parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidCreateDatabaseToWebProcessConnection(clientPort), 0);
     192#elif USE(UNIX_DOMAIN_SOCKETS)
     193    IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection();
     194    m_databaseToWebProcessConnections.append(DatabaseToWebProcessConnection::create(socketPair.server));
     195    parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidCreateDatabaseToWebProcessConnection(IPC::Attachment(socketPair.client)), 0);
    191196#else
    192197    notImplemented();

  • trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp

    r172193 r179007  
    3838#include "WebIDBServerConnectionMessages.h"
    3939#include <WebCore/IDBDatabaseMetadata.h>
     40#include <WebCore/IDBIndexMetadata.h>
     41#include <WebCore/IDBObjectStoreMetadata.h>
    4042#include <WebCore/IDBServerConnection.h>
    4143#include <WebCore/IndexedDB.h>

  • trunk/Source/WebKit2/PlatformGTK.cmake

    r178095 r179007  
    1616
    1717list(APPEND WebKit2_SOURCES
     18    DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp
     19
    1820    NetworkProcess/cache/NetworkCacheStorageSoup.cpp
    1921
    … …  
    5153
    5254    Shared/gtk/ArgumentCodersGtk.cpp
     55    Shared/gtk/KeyedEncoder.cpp
     56    Shared/gtk/KeyedDecoder.cpp
    5357    Shared/gtk/NativeWebKeyboardEventGtk.cpp
    5458    Shared/gtk/NativeWebMouseEventGtk.cpp
    … …  
    7276
    7377    Shared/unix/ChildProcessMain.cpp
     78
     79    UIProcess/Databases/gtk/DatabaseProcessProxyGtk.cpp
    7480
    7581    UIProcess/DefaultUndoController.cpp
    … …  
    432438    "${WEBCORE_DIR}/platform/network/soup"
    433439    "${WEBCORE_DIR}/platform/text/enchant"
     440    "${WEBKIT2_DIR}/DatabaseProcess/unix"
    434441    "${WEBKIT2_DIR}/NetworkProcess/gtk"
    435442    "${WEBKIT2_DIR}/NetworkProcess/unix"
    … …  
    487494list(APPEND NetworkProcess_SOURCES
    488495    NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
     496)
     497
     498list(APPEND DatabaseProcess_SOURCES
     499    DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp
    489500)
    490501
    … …  
    951962            ${WebProcess_SOURCES}
    952963            ${NetworkProcess_SOURCES}
     964            ${DatabaseProcess_SOURCES}
    953965            ${PluginProcessGTK2_SOURCES}
    954966            ${PluginProcess_SOURCES}

  • trunk/Source/WebKit2/Shared/ProcessExecutablePath.h

    r155934 r179007  
    3636String executablePathOfNetworkProcess();
    3737#endif
    38 
     38#if ENABLE(DATABASE_PROCESS)
     39String executablePathOfDatabaseProcess();
     40#endif
    3941}
    4042

  • trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp

    r161020 r179007  
    8080#endif
    8181
     82#if ENABLE(DATABASE_PROCESS)
     83String executablePathOfDatabaseProcess()
     84{
     85    return findWebKitProcess("WebKitDatabaseProcess");
     86}
     87#endif
     88
    8289} // namespace WebKit

  • trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp

    r178598 r179007  
    3232#include "WebOriginDataManagerProxyMessages.h"
    3333#include "WebProcessPool.h"
     34#include <WebCore/NotImplemented.h>
    3435
    3536#if ENABLE(DATABASE_PROCESS)
    … …  
    118119#if OS(DARWIN)
    119120    reply->send(IPC::Attachment(connectionIdentifier.port(), MACH_MSG_TYPE_MOVE_SEND));
     121#elif USE(UNIX_DOMAIN_SOCKETS)
     122    reply->send(connectionIdentifier);
    120123#else
    121124    notImplemented();

  • trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp

    r178825 r179007  
    8080        break;
    8181#endif
     82#if ENABLE(DATABASE_PROCESS)
     83    case DatabaseProcess:
     84        executablePath = executablePathOfDatabaseProcess();
     85        break;
     86#endif
    8287    default:
    8388        ASSERT_NOT_REACHED();

  • trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp

    r178685 r179007  
    121121String WebProcessPool::legacyPlatformDefaultIndexedDBDatabaseDirectory()
    122122{
    123     notImplemented();
    124     return String();
     123    GUniquePtr<gchar> indexedDBDatabaseDirectory(g_build_filename(g_get_user_data_dir(), "webkitgtk", "databases", "indexeddb", nullptr));
     124    return WebCore::filenameToString(indexedDBDatabaseDirectory.get());
    125125}
    126126

  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r178940 r179007  
    10391039#if OS(DARWIN)
    10401040    IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
    1041     if (IPC::Connection::identifierIsNull(connectionIdentifier))
    1042         return;
     1041#elif USE(UNIX_DOMAIN_SOCKETS)
     1042    IPC::Connection::Identifier connectionIdentifier = encodedConnectionIdentifier.releaseFileDescriptor();
    10431043#else
    10441044    ASSERT_NOT_REACHED();
    10451045#endif
     1046    if (IPC::Connection::identifierIsNull(connectionIdentifier))
     1047        return;
    10461048    m_webToDatabaseProcessConnection = WebToDatabaseProcessConnection::create(connectionIdentifier);
    10471049}

  • trunk/Source/cmake/OptionsGTK.cmake

    r178820 r179007  
    220220set(WebKit2_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
    221221set(WebKit2_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
     222set(WebKit2_DatabaseProcess_OUTPUT_NAME WebKitDatabaseProcess)
    222223
    223224add_definitions(-DBUILDING_GTK__=1)
Note: See TracChangeset for help on using the changeset viewer.