Title: [99537] trunk/Source/WebKit2
- Revision
- 99537
- Author
- [email protected]
- Date
- 2011-11-08 01:07:29 -0800 (Tue, 08 Nov 2011)
Log Message
[WK2][GTK] Application cache directory is incorrectly set
https://bugs.webkit.org/show_bug.cgi?id=70680
Patch by Zan Dobersek <[email protected]> on 2011-11-08
Reviewed by Philippe Normand.
Correctly set application cache directory to be in current
user's default cache directory.
* UIProcess/gtk/WebContextGtk.cpp:
(WebKit::WebContext::applicationCacheDirectory):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (99536 => 99537)
--- trunk/Source/WebKit2/ChangeLog 2011-11-08 09:04:45 UTC (rev 99536)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-08 09:07:29 UTC (rev 99537)
@@ -1,3 +1,16 @@
+2011-11-08 Zan Dobersek <[email protected]>
+
+ [WK2][GTK] Application cache directory is incorrectly set
+ https://bugs.webkit.org/show_bug.cgi?id=70680
+
+ Reviewed by Philippe Normand.
+
+ Correctly set application cache directory to be in current
+ user's default cache directory.
+
+ * UIProcess/gtk/WebContextGtk.cpp:
+ (WebKit::WebContext::applicationCacheDirectory):
+
2011-11-07 Emil A Eklund <[email protected]>
Revert platform and scrolling to ints
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp (99536 => 99537)
--- trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2011-11-08 09:04:45 UTC (rev 99536)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2011-11-08 09:07:29 UTC (rev 99537)
@@ -29,13 +29,12 @@
#include <WebCore/FileSystem.h>
#include <wtf/gobject/GOwnPtr.h>
-#include "ApplicationCacheStorage.h"
-
namespace WebKit {
WTF::String WebContext::applicationCacheDirectory()
{
- return WebCore::cacheStorage().cacheDirectory();
+ GOwnPtr<gchar> cacheDirectory(g_build_filename(g_get_user_cache_dir(), "webkitgtk", "applications", NULL));
+ return WebCore::filenameToString(cacheDirectory.get());
}
void WebContext::platformInitializeWebProcess(WebProcessCreationParameters&)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
