Changeset 148887 in webkit

Timestamp:

Apr 22, 2013 9:03:21 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Add webkit_web_context_set_disk_cache_directory to WebKit2 GTK+ API
​https://bugs.webkit.org/show_bug.cgi?id=111848

Reviewed by Anders Carlsson.

This allow applications to set a custom directory for the disk
cache.

• UIProcess/API/gtk/WebKitWebContext.cpp:

(webkit_web_context_set_disk_cache_directory):

• UIProcess/API/gtk/WebKitWebContext.h:
• UIProcess/API/gtk/docs/webkit2gtk-sections.txt: Add new symbol.
• UIProcess/API/gtk/tests/TestMain.cpp:

(removeNonEmptyDirectory):
(main): Use a different temporary disk cache directory for every
test.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebContext.cpp (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebContext.h (modified) (1 diff)
• UIProcess/API/gtk/docs/webkit2gtk-sections.txt (modified) (1 diff)
• UIProcess/API/gtk/tests/TestMain.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-22  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Add webkit_web_context_set_disk_cache_directory to WebKit2 GTK+ API
+        https://bugs.webkit.org/show_bug.cgi?id=111848
+
+        Reviewed by Anders Carlsson.
+
+        This allow applications to set a custom directory for the disk
+        cache.
+
+        * UIProcess/API/gtk/WebKitWebContext.cpp:
+        (webkit_web_context_set_disk_cache_directory):
+        * UIProcess/API/gtk/WebKitWebContext.h:
+        * UIProcess/API/gtk/docs/webkit2gtk-sections.txt: Add new symbol.
+        * UIProcess/API/gtk/tests/TestMain.cpp:
+        (removeNonEmptyDirectory):
+        (main): Use a different temporary disk cache directory for every
+        test.
+
 2013-04-22  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -774 +774 @@
 
 /**
+ * webkit_web_context_set_disk_cache_directory:
+ * @context: a #WebKitWebContext
+ * @directory: the directory to set
+ *
+ * Set the directory where disk cache files will be stored
+ * This method must be called before loading anything in this context, otherwise
+ * it will not have any effect.
+ */
+void webkit_web_context_set_disk_cache_directory(WebKitWebContext* context, const char* directory)
+{
+    g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
+    g_return_if_fail(directory);
+
+    context->priv->context->setDiskCacheDirectory(WebCore::filenameToString(directory));
+}
+
+/**
  * webkit_web_context_prefetch_dns:
  * @context: a #WebKitWebContext

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

@@ -193 +193 @@
                                                      const gchar                   *hostname);
 
+WEBKIT_API void
+webkit_web_context_set_disk_cache_directory         (WebKitWebContext              *context,
+                                                     const gchar                   *directory);
+
 G_END_DECLS
 

trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt

@@ -48 +48 @@
 webkit_web_context_set_web_extensions_directory
 webkit_web_context_prefetch_dns
+webkit_web_context_set_disk_cache_directory
 
 <SUBSECTION URI Scheme>

trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestMain.cpp

@@ -21 +21 @@
 #include "TestMain.h"
 
+#include <glib/gstdio.h>
 #include <gtk/gtk.h>
+#include <webkit2/webkit2.h>
+#include <wtf/gobject/GOwnPtr.h>
 
 void beforeAll();
@@ -36 +39 @@
 }
 
+static void removeNonEmptyDirectory(const char* directoryPath)
+{
+    GDir* directory = g_dir_open(directoryPath, 0, 0);
+    g_assert(directory);
+    const char* fileName;
+    while ((fileName = g_dir_read_name(directory))) {
+        GOwnPtr<char> filePath(g_build_filename(directoryPath, fileName, NULL));
+        g_unlink(filePath.get());
+    }
+    g_dir_close(directory);
+    g_rmdir(directoryPath);
+}
+
 int main(int argc, char** argv)
 {
@@ -46 +62 @@
     registerGResource();
 
+    GOwnPtr<char> diskCacheTempDirectory(g_dir_make_tmp("WebKit2TestsDiskCache-XXXXXX", 0));
+    g_assert(diskCacheTempDirectory.get());
+    webkit_web_context_set_disk_cache_directory(webkit_web_context_get_default(), diskCacheTempDirectory.get());
+
     beforeAll();
     int returnValue = g_test_run();
     afterAll();
 
+    removeNonEmptyDirectory(diskCacheTempDirectory.get());
+
     return returnValue;
 }