Changeset 176512 in webkit

Timestamp:

Nov 23, 2014, 11:24:01 PM (12 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Add API to override the default local storage directory
​https://bugs.webkit.org/show_bug.cgi?id=138828

Reviewed by Gustavo Noronha Silva.

Source/WebKit2:

Add WebKitWebContext:local-storage-directory construct-only
property. If not provided the default will be used.

• UIProcess/API/gtk/WebKitWebContext.cpp:

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

Tools:

Add test to check that the local storage directory is created at
the path given on construction.

• TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:

(testWebContextConfiguration):
(beforeAll):

• TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h:

(Test::Test):
(Test::~Test): Deleted.

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 @@
+2014-11-23  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Add API to override the default local storage directory
+        https://bugs.webkit.org/show_bug.cgi?id=138828
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Add WebKitWebContext:local-storage-directory construct-only
+        property. If not provided the default will be used.
+
+        * UIProcess/API/gtk/WebKitWebContext.cpp:
+        (webkitWebContextGetProperty):
+        (webkitWebContextSetProperty):
+        (webkitWebContextConstructed):
+        (webkit_web_context_class_init):
+
 2014-11-23  Conrad Shultz  <conrad_shultz@apple.com>
 

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

@@ -49 +49 @@
 #include <WebCore/IconDatabase.h>
 #include <WebCore/Language.h>
+#include <glib/gi18n-lib.h>
 #include <libintl.h>
 #include <memory>
@@ -94 +95 @@
  *
  */
+
+enum {
+    PROP_0,
+
+    PROP_LOCAL_STORAGE_DIRECTORY
+};
 
 enum {
@@ -170 +177 @@
     CString webExtensionsDirectory;
     GRefPtr<GVariant> webExtensionsInitializationUserData;
+
+    CString localStorageDirectory;
 };
 
@@ -213 +222 @@
 }
 
+static void webkitWebContextGetProperty(GObject* object, guint propID, GValue* value, GParamSpec* paramSpec)
+{
+    WebKitWebContext* context = WEBKIT_WEB_CONTEXT(object);
+
+    switch (propID) {
+    case PROP_LOCAL_STORAGE_DIRECTORY:
+        g_value_set_string(value, context->priv->localStorageDirectory.data());
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propID, paramSpec);
+    }
+}
+
+static void webkitWebContextSetProperty(GObject* object, guint propID, const GValue* value, GParamSpec* paramSpec)
+{
+    WebKitWebContext* context = WEBKIT_WEB_CONTEXT(object);
+
+    switch (propID) {
+    case PROP_LOCAL_STORAGE_DIRECTORY:
+        context->priv->localStorageDirectory = g_value_get_string(value);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propID, paramSpec);
+    }
+}
+
 static void webkitWebContextConstructed(GObject* object)
 {
@@ -221 +256 @@
     webContextConfiguration.injectedBundlePath = WebCore::filenameToString(bundleFilename.get());
     WebContext::applyPlatformSpecificConfigurationDefaults(webContextConfiguration);
-
     WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(object);
     WebKitWebContextPrivate* priv = webContext->priv;
+    if (!priv->localStorageDirectory.isNull())
+        webContextConfiguration.localStorageDirectory = WebCore::filenameToString(priv->localStorageDirectory.data());
+
     priv->context = WebContext::create(WTF::move(webContextConfiguration));
 
@@ -266 +303 @@
     bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
 
+    gObjectClass->get_property = webkitWebContextGetProperty;
+    gObjectClass->set_property = webkitWebContextSetProperty;
     gObjectClass->constructed = webkitWebContextConstructed;
     gObjectClass->dispose = webkitWebContextDispose;
+
+    /**
+     * WebKitWebContext:local-storage-directory:
+     *
+     * The directory where local storage data will be saved.
+     *
+     * Since: 2.8
+     */
+    g_object_class_install_property(
+        gObjectClass,
+        PROP_LOCAL_STORAGE_DIRECTORY,
+        g_param_spec_string(
+            "local-storage-directory",
+            _("Local Storage Directory"),
+            _("The directory where local storage data will be saved"),
+            nullptr,
+            static_cast<GParamFlags>(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));
 
     /**

trunk/Tools/ChangeLog

@@ +1 @@
+2014-11-23  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Add API to override the default local storage directory
+        https://bugs.webkit.org/show_bug.cgi?id=138828
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Add test to check that the local storage directory is created at
+        the path given on construction.
+
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
+        (testWebContextConfiguration):
+        (beforeAll):
+        * TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h:
+        (Test::Test):
+        (Test::~Test): Deleted.
+
 2014-11-21  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -38 +38 @@
 }
 
+static void testWebContextConfiguration(WebViewTest* test, gconstpointer)
+{
+    GUniquePtr<char> localStorageDirectory(g_build_filename(Test::dataDirectory(), "local-storage", nullptr));
+    g_assert(g_file_test(localStorageDirectory.get(), G_FILE_TEST_IS_DIR));
+}
+
 class PluginsTest: public Test {
 public:
@@ -412 +418 @@
 
     Test::add("WebKitWebContext", "default-context", testWebContextDefault);
+    WebViewTest::add("WebKitWebContext", "configuration", testWebContextConfiguration);
     PluginsTest::add("WebKitWebContext", "get-plugins", testWebContextGetPlugins);
     URISchemeTest::add("WebKitWebContext", "uri-scheme", testWebContextURIScheme);

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

@@ -67 +67 @@
 
     Test()
-        : m_webContext(adoptGRef(webkit_web_context_new()))
     {
+        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)));
+
         g_signal_connect(m_webContext.get(), "initialize-web-extensions", G_CALLBACK(initializeWebExtensionsCallback), this);
         GUniquePtr<char> diskCacheDirectory(g_build_filename(dataDirectory(), "disk-cache", nullptr));