summaryrefslogtreecommitdiff
path: root/Source/WebKit2/UIProcess/qt/WebContextQt.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-09-10 19:10:20 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-09-10 19:10:20 +0200
commit284837daa07b29d6a63a748544a90b1f5842ac5c (patch)
treeecd258180bde91fe741e0cfd2638beb3c6da7e8e /Source/WebKit2/UIProcess/qt/WebContextQt.cpp
parent2e2ba8ff45915f40ed3e014101269c175f2a89a0 (diff)
downloadqtwebkit-284837daa07b29d6a63a748544a90b1f5842ac5c.tar.gz
Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)
New snapshot
Diffstat (limited to 'Source/WebKit2/UIProcess/qt/WebContextQt.cpp')
-rw-r--r--Source/WebKit2/UIProcess/qt/WebContextQt.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/WebKit2/UIProcess/qt/WebContextQt.cpp b/Source/WebKit2/UIProcess/qt/WebContextQt.cpp
index 3f38dd288..f6af89d62 100644
--- a/Source/WebKit2/UIProcess/qt/WebContextQt.cpp
+++ b/Source/WebKit2/UIProcess/qt/WebContextQt.cpp
@@ -58,7 +58,12 @@ static String defaultDiskCacheDirectory()
String WebContext::applicationCacheDirectory()
{
- return WebCore::cacheStorage().cacheDirectory();
+ const String cacheDirectory = WebCore::cacheStorage().cacheDirectory();
+
+ if (cacheDirectory.isEmpty())
+ return defaultDiskCacheDirectory();
+
+ return cacheDirectory;
}
void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& parameters)