diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebKit2/UIProcess/qt/WebContextQt.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-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/qt/WebContextQt.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/qt/WebContextQt.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Source/WebKit2/UIProcess/qt/WebContextQt.cpp b/Source/WebKit2/UIProcess/qt/WebContextQt.cpp index f6af89d62..45329db44 100644 --- a/Source/WebKit2/UIProcess/qt/WebContextQt.cpp +++ b/Source/WebKit2/UIProcess/qt/WebContextQt.cpp @@ -43,8 +43,9 @@ namespace WebKit { static QString s_defaultDatabaseDirectory; static QString s_defaultLocalStorageDirectory; +static QString s_defaultCookieStorageDirectory; -static String defaultDiskCacheDirectory() +String WebContext::platformDefaultDiskCacheDirectory() const { static String s_defaultDiskCacheDirectory; @@ -61,7 +62,7 @@ String WebContext::applicationCacheDirectory() const String cacheDirectory = WebCore::cacheStorage().cacheDirectory(); if (cacheDirectory.isEmpty()) - return defaultDiskCacheDirectory(); + return platformDefaultDiskCacheDirectory(); return cacheDirectory; } @@ -69,8 +70,6 @@ String WebContext::applicationCacheDirectory() void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& parameters) { qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus"); - parameters.cookieStorageDirectory = defaultDataLocation(); - parameters.diskCacheDirectory = defaultDiskCacheDirectory(); #if ENABLE(GEOLOCATION) static WebGeolocationProviderQt* location = WebGeolocationProviderQt::create(toAPI(geolocationManagerProxy())); WKGeolocationManagerSetProvider(toAPI(geolocationManagerProxy()), WebGeolocationProviderQt::provider(location)); @@ -106,4 +105,13 @@ String WebContext::platformDefaultLocalStorageDirectory() const return s_defaultLocalStorageDirectory; } +String WebContext::platformDefaultCookieStorageDirectory() const +{ + if (!s_defaultCookieStorageDirectory.isEmpty()) + return s_defaultCookieStorageDirectory; + + s_defaultCookieStorageDirectory = defaultDataLocation(); + return s_defaultCookieStorageDirectory; +} + } // namespace WebKit |