summaryrefslogtreecommitdiff
path: root/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-10-17 16:21:14 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-10-17 16:21:14 +0200
commit8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch)
tree17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp
parentb9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff)
downloadqtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well as the previously cherry-picked changes
Diffstat (limited to 'Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp')
-rw-r--r--Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp17
1 files changed, 15 insertions, 2 deletions
diff --git a/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp b/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp
index 71c7bbe3c..afeb1723e 100644
--- a/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp
+++ b/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp
@@ -27,6 +27,7 @@
#include "config.h"
#include "WebContext.h"
#include <WebCore/FileSystem.h>
+#include <WebCore/NotImplemented.h>
#include <wtf/gobject/GOwnPtr.h>
namespace WebKit {
@@ -53,8 +54,8 @@ String WebContext::platformDefaultDatabaseDirectory() const
String WebContext::platformDefaultIconDatabasePath() const
{
- // FIXME: Implement.
- return WTF::String();
+ GOwnPtr<gchar> databaseDirectory(g_build_filename(g_get_user_data_dir(), "webkitgtk", "icondatabase", NULL));
+ return WebCore::filenameToString(databaseDirectory.get());
}
String WebContext::platformDefaultLocalStorageDirectory() const
@@ -63,4 +64,16 @@ String WebContext::platformDefaultLocalStorageDirectory() const
return WebCore::filenameToString(storageDirectory.get());
}
+String WebContext::platformDefaultDiskCacheDirectory() const
+{
+ notImplemented();
+ return String();
+}
+
+String WebContext::platformDefaultCookieStorageDirectory() const
+{
+ notImplemented();
+ return String();
+}
+
} // namespace WebKit