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/win/WebContextWin.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/win/WebContextWin.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/win/WebContextWin.cpp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/Source/WebKit2/UIProcess/win/WebContextWin.cpp b/Source/WebKit2/UIProcess/win/WebContextWin.cpp index 9964de06c..9dd056820 100644 --- a/Source/WebKit2/UIProcess/win/WebContextWin.cpp +++ b/Source/WebKit2/UIProcess/win/WebContextWin.cpp @@ -29,6 +29,7 @@ #include "WebProcessCreationParameters.h" #include "WebProcessMessages.h" #include <WebCore/FileSystem.h> +#include <WebCore/NotImplemented.h> #if USE(CFNETWORK) #include <CFNetwork/CFURLCachePriv.h> @@ -61,11 +62,11 @@ void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& para parameters.cfURLCacheMemoryCapacity = CFURLCacheMemoryCapacity(cfurlCache.get()); RetainPtr<CFStringRef> cfURLCachePath(AdoptCF, wkCopyFoundationCacheDirectory(0)); - parameters.cfURLCachePath = String(cfURLCachePath.get()); + parameters.diskCacheDirectory = String(cfURLCachePath.get()); // Remove the ending '\' (necessary to have CFNetwork find the Cache file). - ASSERT(parameters.cfURLCachePath.length()); - if (parameters.cfURLCachePath[parameters.cfURLCachePath.length() - 1] == '\\') - parameters.cfURLCachePath.remove(parameters.cfURLCachePath.length() - 1); + ASSERT(parameters.diskCacheDirectory.length()); + if (parameters.diskCacheDirectory.endsWith(UChar('\\'))) + parameters.diskCacheDirectory.remove(parameters.diskCacheDirectory.length() - 1); #if USE(CFURLSTORAGESESSIONS) parameters.uiProcessBundleIdentifier = String(reinterpret_cast<CFStringRef>(CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), kCFBundleIdentifierKey))); @@ -97,5 +98,16 @@ String WebContext::platformDefaultLocalStorageDirectory() const return WebCore::pathByAppendingComponent(WebCore::localUserSpecificStorageDirectory(), "LocalStorage"); } +String WebContext::platformDefaultDiskCacheDirectory() const +{ + return WebCore::pathByAppendingComponent(WebCore::localUserSpecificStorageDirectory(), "cache"); +} + +String WebContext::platformDefaultCookieStorageDirectory() const +{ + notImplemented(); + return String(); +} + } // namespace WebKit |