Changeset 99578 in webkit

Timestamp:

Nov 8, 2011, 9:36:04 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[WK][GTK] Application cache directory is incorrectly set
​https://bugs.webkit.org/show_bug.cgi?id=71769

Patch by Zan Dobersek <​zandobersek@gmail.com> on 2011-11-08
Reviewed by Martin Robinson.

Set the application cache directory to be placed in current user's
cache directory and update documentation for
webkit_application_cache_get_database_directory_path after these
changes and changes in r80715;

• webkit/webkitapplicationcache.cpp:
• webkit/webkitglobals.cpp:

(webkitInit): Switch one string formation to use GOwnPtr<gchar>.

Location:

trunk/Source/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• webkit/webkitapplicationcache.cpp (modified) (1 diff)
• webkit/webkitglobals.cpp (modified) (1 diff)

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2011-11-08  Zan Dobersek  <zandobersek@gmail.com>
+
+        [WK][GTK] Application cache directory is incorrectly set
+        https://bugs.webkit.org/show_bug.cgi?id=71769
+
+        Reviewed by Martin Robinson.
+
+        Set the application cache directory to be placed in current user's
+        cache directory and update documentation for
+        webkit_application_cache_get_database_directory_path after these
+        changes and changes in r80715;
+
+        * webkit/webkitapplicationcache.cpp:
+        * webkit/webkitglobals.cpp:
+        (webkitInit): Switch one string formation to use GOwnPtr<gchar>.
+
 2011-11-03  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit/gtk/webkit/webkitapplicationcache.cpp

@@ -66 +66 @@
 
 /**
- * webkit_spplication_cache_get_database_directory_path:
+ * webkit_application_cache_get_database_directory_path:
  *
- * Returns the current path to the directory WebKit will write web application
- * cache databases. By default this path is set to $XDG_DATA_HOME/webkit/databases
- * with webkit_application_cache_set_database_directory_path
+ * Returns the path to the directory WebKit will write web application
+ * cache databases to. By default this path is set to
+ * $XDG_CACHE_HOME/webkitgtk/applications and cannot be modified.
  *
- * Returns: the current application cache database directory path
+ * Returns: the application cache database directory path
  *
  * Since: 1.3.13

trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp

@@ -317 +317 @@
     atomicCanonicalTextEncodingName("UTF-8");
 
-    gchar* databaseDirectory = g_build_filename(g_get_user_data_dir(), "webkit", "databases", NULL);
-    webkit_set_web_database_directory_path(databaseDirectory);
-    WebCore::cacheStorage().setCacheDirectory(databaseDirectory);
-
-    g_free(databaseDirectory);
+    GOwnPtr<gchar> databaseDirectory(g_build_filename(g_get_user_data_dir(), "webkit", "databases", NULL));
+    webkit_set_web_database_directory_path(databaseDirectory.get());
+
+    GOwnPtr<gchar> cacheDirectory(g_build_filename(g_get_user_cache_dir(), "webkitgtk", "applications", NULL));
+    WebCore::cacheStorage().setCacheDirectory(cacheDirectory.get());
 
     PageGroup::setShouldTrackVisitedLinks(true);