Changeset 184851 in webkit

Timestamp:

May 25, 2015 8:15:38 AM (9 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Add construct property to WebKitWebContext to set the IndexedDB database directory
​https://bugs.webkit.org/show_bug.cgi?id=140882

Reviewed by Gustavo Noronha Silva.

Source/WebKit2:

Add WebKitWebContext:indexed-db-database-directory construct only property.

• UIProcess/API/gtk/WebKitWebContext.cpp:

(webkitWebContextGetProperty):
(webkitWebContextSetProperty):
(webkitWebContextConstructed):
(webkit_web_context_class_init):

Tools:

Make sure unit tests write IndexedDB databases to the temporary
directory, and add a test case to check that the directory is
correctly created at the expected path.

• TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:

(testWebContextConfiguration):
(serverCallback):

• TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h:

(Test::Test):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (modified) (6 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp (modified) (2 diffs)
• Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-05-25  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Add construct property to WebKitWebContext to set the IndexedDB database directory
+        https://bugs.webkit.org/show_bug.cgi?id=140882
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Add WebKitWebContext:indexed-db-database-directory construct only property.
+
+        * UIProcess/API/gtk/WebKitWebContext.cpp:
+        (webkitWebContextGetProperty):
+        (webkitWebContextSetProperty):
+        (webkitWebContextConstructed):
+        (webkit_web_context_class_init):
+
 2015-05-24  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp

@@ -103 +103 @@
     PROP_0,
 
-    PROP_LOCAL_STORAGE_DIRECTORY
+    PROP_LOCAL_STORAGE_DIRECTORY,
+    PROP_INDEXED_DB_DIRECTORY
 };
 
@@ -183 +184 @@
 
     CString localStorageDirectory;
+    CString indexedDBDirectory;
 };
 
@@ -236 +238 @@
         g_value_set_string(value, context->priv->localStorageDirectory.data());
         break;
+    case PROP_INDEXED_DB_DIRECTORY:
+        g_value_set_string(value, context->priv->indexedDBDirectory.data());
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propID, paramSpec);
@@ -249 +254 @@
         context->priv->localStorageDirectory = g_value_get_string(value);
         break;
+    case PROP_INDEXED_DB_DIRECTORY:
+        context->priv->indexedDBDirectory = g_value_get_string(value);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propID, paramSpec);
@@ -267 +275 @@
     if (!priv->localStorageDirectory.isNull())
         configuration->setLocalStorageDirectory(WebCore::filenameToString(priv->localStorageDirectory.data()));
+    if (!priv->indexedDBDirectory.isNull())
+        configuration->setIndexedDBDatabaseDirectory(WebCore::filenameToString(priv->indexedDBDirectory.data()));
 
     priv->context = WebProcessPool::create(configuration.get());
@@ -329 +339 @@
             _("Local Storage Directory"),
             _("The directory where local storage data will be saved"),
+            nullptr,
+            static_cast<GParamFlags>(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));
+
+    /**
+     * WebKitWebContext:indexed-db-directory:
+     *
+     * The directory where IndexedDB databases will be saved.
+     *
+     * Since: 2.10
+     */
+    g_object_class_install_property(
+        gObjectClass,
+        PROP_INDEXED_DB_DIRECTORY,
+        g_param_spec_string(
+            "indexed-db-directory",
+            _("IndexedDB Directory"),
+            _("The directory where IndexedDB databases will be saved"),
             nullptr,
             static_cast<GParamFlags>(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));

trunk/Tools/ChangeLog

@@ +1 @@
+2015-05-25  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Add construct property to WebKitWebContext to set the IndexedDB database directory
+        https://bugs.webkit.org/show_bug.cgi?id=140882
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Make sure unit tests write IndexedDB databases to the temporary
+        directory, and add a test case to check that the directory is
+        correctly created at the expected path.
+
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
+        (testWebContextConfiguration):
+        (serverCallback):
+        * TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h:
+        (Test::Test):
+
 2015-05-25  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp

@@ -42 +42 @@
     GUniquePtr<char> localStorageDirectory(g_build_filename(Test::dataDirectory(), "local-storage", nullptr));
     g_assert(g_file_test(localStorageDirectory.get(), G_FILE_TEST_IS_DIR));
+
+    test->loadURI(kServer->getURIForPath("/empty").data());
+    test->waitUntilLoadFinished();
+    test->runJavaScriptAndWaitUntilFinished("window.indexedDB.open('TestDatabase');", nullptr);
+    GUniquePtr<char> indexedDBDirectory(g_build_filename(Test::dataDirectory(), "indexeddb", nullptr));
+    g_assert(g_file_test(indexedDBDirectory.get(), G_FILE_TEST_IS_DIR));
 }
 
@@ -331 +337 @@
         soup_message_body_append(message->response_body, SOUP_MEMORY_COPY, acceptLanguage, strlen(acceptLanguage));
         soup_message_body_complete(message->response_body);
+    } else if (g_str_equal(path, "/empty")) {
+        const char* emptyHTML = "<html><body></body></html>";
+        soup_message_body_append(message->response_body, SOUP_MEMORY_STATIC, emptyHTML, strlen(emptyHTML));
+        soup_message_body_complete(message->response_body);
+        soup_message_set_status(message, SOUP_STATUS_OK);
     } else
         soup_message_set_status(message, SOUP_STATUS_NOT_FOUND);

trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h

@@ -69 +69 @@
     {
         GUniquePtr<char> localStorageDirectory(g_build_filename(dataDirectory(), "local-storage", nullptr));
-        m_webContext = adoptGRef(WEBKIT_WEB_CONTEXT(g_object_new(WEBKIT_TYPE_WEB_CONTEXT, "local-storage-directory", localStorageDirectory.get(), nullptr)));
+        GUniquePtr<char> indexedDBDirectory(g_build_filename(dataDirectory(), "indexeddb", nullptr));
+        m_webContext = adoptGRef(WEBKIT_WEB_CONTEXT(g_object_new(WEBKIT_TYPE_WEB_CONTEXT,
+            "local-storage-directory", localStorageDirectory.get(),
+            "indexed-db-directory", indexedDBDirectory.get(),
+            nullptr)));
 
         g_signal_connect(m_webContext.get(), "initialize-web-extensions", G_CALLBACK(initializeWebExtensionsCallback), this);