diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit2/WebProcess/win/WebProcessWin.cpp | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit2/WebProcess/win/WebProcessWin.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/win/WebProcessWin.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Source/WebKit2/WebProcess/win/WebProcessWin.cpp b/Source/WebKit2/WebProcess/win/WebProcessWin.cpp index 97e2385..58230d3 100644 --- a/Source/WebKit2/WebProcess/win/WebProcessWin.cpp +++ b/Source/WebKit2/WebProcess/win/WebProcessWin.cpp @@ -108,9 +108,20 @@ void WebProcess::platformClearResourceCaches() void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters& parameters, CoreIPC::ArgumentDecoder*) { setShouldPaintNativeControls(parameters.shouldPaintNativeControls); + +#if USE(CFNETWORK) + RetainPtr<CFStringRef> cachePath(AdoptCF, parameters.cfURLCachePath.createCFString()); + if (!cachePath) + return; + + CFIndex cacheDiskCapacity = parameters.cfURLCacheDiskCapacity; + CFIndex cacheMemoryCapacity = parameters.cfURLCacheMemoryCapacity; + RetainPtr<CFURLCacheRef> uiProcessCache(AdoptCF, CFURLCacheCreate(kCFAllocatorDefault, cacheMemoryCapacity, cacheDiskCapacity, cachePath.get())); + CFURLCacheSetSharedURLCache(uiProcessCache.get()); +#endif } -void WebProcess::platformShutdown() +void WebProcess::platformTerminate() { } |