Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (137802 => 137803)
--- trunk/Source/WebKit2/CMakeLists.txt 2012-12-15 20:13:41 UTC (rev 137802)
+++ trunk/Source/WebKit2/CMakeLists.txt 2012-12-15 20:26:40 UTC (rev 137803)
@@ -139,6 +139,7 @@
Shared/APIClientTraits.cpp
Shared/APIObject.cpp
+ Shared/CacheModel.cpp
Shared/ChildProcess.cpp
Shared/ChildProcessProxy.cpp
Shared/ConnectionStack.cpp
Modified: trunk/Source/WebKit2/ChangeLog (137802 => 137803)
--- trunk/Source/WebKit2/ChangeLog 2012-12-15 20:13:41 UTC (rev 137802)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-15 20:26:40 UTC (rev 137803)
@@ -1,3 +1,26 @@
+2012-12-15 Sam Weinig <[email protected]>
+
+ Move calculation of caches sizes based on the cache model to CacheModel.h/cpp
+ https://bugs.webkit.org/show_bug.cgi?id=105098
+
+ Reviewed by Anders Carlsson.
+
+ Move calculation of caches sizes based on the cache model to CacheModel.h/cpp so
+ that it can be used by more than just the WebProcess.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * Shared/CacheModel.cpp: Added.
+ (WebKit):
+ (WebKit::calculateCacheSizes):
+ * Shared/CacheModel.h:
+ * Target.pri:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebProcess.cpp:
+ * WebProcess/WebProcess.h:
+ (WebProcess):
+ * win/WebKit2.vcproj:
+
2012-12-15 Anders Carlsson <[email protected]>
DownloadProxyMap shouldn't be a singleton after all
Modified: trunk/Source/WebKit2/GNUmakefile.list.am (137802 => 137803)
--- trunk/Source/WebKit2/GNUmakefile.list.am 2012-12-15 20:13:41 UTC (rev 137802)
+++ trunk/Source/WebKit2/GNUmakefile.list.am 2012-12-15 20:26:40 UTC (rev 137803)
@@ -366,6 +366,7 @@
Source/WebKit2/Shared/BlockingResponseMap.h \
Source/WebKit2/Shared/ShareableBitmap.cpp \
Source/WebKit2/Shared/ShareableBitmap.h \
+ Source/WebKit2/Shared/CacheModel.cpp \
Source/WebKit2/Shared/CacheModel.h \
Source/WebKit2/Shared/ChildProcess.cpp \
Source/WebKit2/Shared/ChildProcess.h \
Added: trunk/Source/WebKit2/Shared/CacheModel.cpp (0 => 137803)
--- trunk/Source/WebKit2/Shared/CacheModel.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/CacheModel.cpp 2012-12-15 20:26:40 UTC (rev 137803)
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2012 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "CacheModel.h"
+
+#include <algorithm>
+
+namespace WebKit {
+
+void calculateCacheSizes(CacheModel cacheModel, uint64_t memorySize, uint64_t diskFreeSize,
+ unsigned& cacheTotalCapacity, unsigned& cacheMinDeadCapacity, unsigned& cacheMaxDeadCapacity, double& deadDecodedDataDeletionInterval,
+ unsigned& pageCacheCapacity, unsigned long& urlCacheMemoryCapacity, unsigned long& urlCacheDiskCapacity)
+{
+ switch (cacheModel) {
+ case CacheModelDocumentViewer: {
+ // Page cache capacity (in pages)
+ pageCacheCapacity = 0;
+
+ // Object cache capacities (in bytes)
+ if (memorySize >= 2048)
+ cacheTotalCapacity = 96 * 1024 * 1024;
+ else if (memorySize >= 1536)
+ cacheTotalCapacity = 64 * 1024 * 1024;
+ else if (memorySize >= 1024)
+ cacheTotalCapacity = 32 * 1024 * 1024;
+ else if (memorySize >= 512)
+ cacheTotalCapacity = 16 * 1024 * 1024;
+
+ cacheMinDeadCapacity = 0;
+ cacheMaxDeadCapacity = 0;
+
+ // Foundation memory cache capacity (in bytes)
+ urlCacheMemoryCapacity = 0;
+
+ // Foundation disk cache capacity (in bytes)
+ urlCacheDiskCapacity = 0;
+
+ break;
+ }
+ case CacheModelDocumentBrowser: {
+ // Page cache capacity (in pages)
+ if (memorySize >= 1024)
+ pageCacheCapacity = 3;
+ else if (memorySize >= 512)
+ pageCacheCapacity = 2;
+ else if (memorySize >= 256)
+ pageCacheCapacity = 1;
+ else
+ pageCacheCapacity = 0;
+
+ // Object cache capacities (in bytes)
+ if (memorySize >= 2048)
+ cacheTotalCapacity = 96 * 1024 * 1024;
+ else if (memorySize >= 1536)
+ cacheTotalCapacity = 64 * 1024 * 1024;
+ else if (memorySize >= 1024)
+ cacheTotalCapacity = 32 * 1024 * 1024;
+ else if (memorySize >= 512)
+ cacheTotalCapacity = 16 * 1024 * 1024;
+
+ cacheMinDeadCapacity = cacheTotalCapacity / 8;
+ cacheMaxDeadCapacity = cacheTotalCapacity / 4;
+
+ // Foundation memory cache capacity (in bytes)
+ if (memorySize >= 2048)
+ urlCacheMemoryCapacity = 4 * 1024 * 1024;
+ else if (memorySize >= 1024)
+ urlCacheMemoryCapacity = 2 * 1024 * 1024;
+ else if (memorySize >= 512)
+ urlCacheMemoryCapacity = 1 * 1024 * 1024;
+ else
+ urlCacheMemoryCapacity = 512 * 1024;
+
+ // Foundation disk cache capacity (in bytes)
+ if (diskFreeSize >= 16384)
+ urlCacheDiskCapacity = 50 * 1024 * 1024;
+ else if (diskFreeSize >= 8192)
+ urlCacheDiskCapacity = 40 * 1024 * 1024;
+ else if (diskFreeSize >= 4096)
+ urlCacheDiskCapacity = 30 * 1024 * 1024;
+ else
+ urlCacheDiskCapacity = 20 * 1024 * 1024;
+
+ break;
+ }
+ case CacheModelPrimaryWebBrowser: {
+ // Page cache capacity (in pages)
+ // (Research indicates that value / page drops substantially after 3 pages.)
+ if (memorySize >= 2048)
+ pageCacheCapacity = 5;
+ else if (memorySize >= 1024)
+ pageCacheCapacity = 4;
+ else if (memorySize >= 512)
+ pageCacheCapacity = 3;
+ else if (memorySize >= 256)
+ pageCacheCapacity = 2;
+ else
+ pageCacheCapacity = 1;
+
+ // Object cache capacities (in bytes)
+ // (Testing indicates that value / MB depends heavily on content and
+ // browsing pattern. Even growth above 128MB can have substantial
+ // value / MB for some content / browsing patterns.)
+ if (memorySize >= 2048)
+ cacheTotalCapacity = 128 * 1024 * 1024;
+ else if (memorySize >= 1536)
+ cacheTotalCapacity = 96 * 1024 * 1024;
+ else if (memorySize >= 1024)
+ cacheTotalCapacity = 64 * 1024 * 1024;
+ else if (memorySize >= 512)
+ cacheTotalCapacity = 32 * 1024 * 1024;
+
+ cacheMinDeadCapacity = cacheTotalCapacity / 4;
+ cacheMaxDeadCapacity = cacheTotalCapacity / 2;
+
+ // This code is here to avoid a PLT regression. We can remove it if we
+ // can prove that the overall system gain would justify the regression.
+ cacheMaxDeadCapacity = std::max(24u, cacheMaxDeadCapacity);
+
+ deadDecodedDataDeletionInterval = 60;
+
+ // Foundation memory cache capacity (in bytes)
+ // (These values are small because WebCore does most caching itself.)
+ if (memorySize >= 1024)
+ urlCacheMemoryCapacity = 4 * 1024 * 1024;
+ else if (memorySize >= 512)
+ urlCacheMemoryCapacity = 2 * 1024 * 1024;
+ else if (memorySize >= 256)
+ urlCacheMemoryCapacity = 1 * 1024 * 1024;
+ else
+ urlCacheMemoryCapacity = 512 * 1024;
+
+ // Foundation disk cache capacity (in bytes)
+ if (diskFreeSize >= 16384)
+ urlCacheDiskCapacity = 175 * 1024 * 1024;
+ else if (diskFreeSize >= 8192)
+ urlCacheDiskCapacity = 150 * 1024 * 1024;
+ else if (diskFreeSize >= 4096)
+ urlCacheDiskCapacity = 125 * 1024 * 1024;
+ else if (diskFreeSize >= 2048)
+ urlCacheDiskCapacity = 100 * 1024 * 1024;
+ else if (diskFreeSize >= 1024)
+ urlCacheDiskCapacity = 75 * 1024 * 1024;
+ else
+ urlCacheDiskCapacity = 50 * 1024 * 1024;
+
+ break;
+ }
+ default:
+ ASSERT_NOT_REACHED();
+ };
+}
+
+} // namespace WebKit
Modified: trunk/Source/WebKit2/Shared/CacheModel.h (137802 => 137803)
--- trunk/Source/WebKit2/Shared/CacheModel.h 2012-12-15 20:13:41 UTC (rev 137802)
+++ trunk/Source/WebKit2/Shared/CacheModel.h 2012-12-15 20:26:40 UTC (rev 137803)
@@ -34,6 +34,10 @@
CacheModelPrimaryWebBrowser
};
+void calculateCacheSizes(CacheModel cacheModel, uint64_t memorySize, uint64_t diskFreeSize,
+ unsigned& cacheTotalCapacity, unsigned& cacheMinDeadCapacity, unsigned& cacheMaxDeadCapacity, double& deadDecodedDataDeletionInterval,
+ unsigned& pageCacheCapacity, unsigned long& urlCacheMemoryCapacity, unsigned long& urlCacheDiskCapacity);
+
} // namespace WebKit
#endif // CacheModel_h
Modified: trunk/Source/WebKit2/Target.pri (137802 => 137803)
--- trunk/Source/WebKit2/Target.pri 2012-12-15 20:13:41 UTC (rev 137802)
+++ trunk/Source/WebKit2/Target.pri 2012-12-15 20:26:40 UTC (rev 137803)
@@ -71,6 +71,7 @@
Shared/API/c/qt/WKImageQt.h \
Shared/APIClientTraits.h \
Shared/ShareableBitmap.h \
+ Shared/CacheModel.cpp \
Shared/CacheModel.h \
Shared/ChildProcess.h \
Shared/ChildProcessProxy.h \
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (137802 => 137803)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2012-12-15 20:13:41 UTC (rev 137802)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2012-12-15 20:26:40 UTC (rev 137803)
@@ -964,6 +964,7 @@
BCEE966D112FAF57006BCC24 /* Attachment.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEE966B112FAF57006BCC24 /* Attachment.h */; };
BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF049E411FE20F600F86A58 /* WKBundleFramePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCF049E711FE20F600F86A58 /* WKBundlePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF049E511FE20F600F86A58 /* WKBundlePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ BCF18638167D071E00A1A85A /* CacheModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF18637167D071E00A1A85A /* CacheModel.cpp */; };
BCF505E71243047B005955AE /* PlatformCertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF505E51243047B005955AE /* PlatformCertificateInfo.h */; };
BCF505E81243047B005955AE /* PlatformCertificateInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCF505E61243047B005955AE /* PlatformCertificateInfo.mm */; };
BCF50728124329AA005955AE /* WebCertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF50726124329AA005955AE /* WebCertificateInfo.h */; };
@@ -2239,6 +2240,7 @@
BCF049E511FE20F600F86A58 /* WKBundlePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePrivate.h; sourceTree = "<group>"; };
BCF04C8C11FF9B7D00F86A58 /* APIObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIObject.h; sourceTree = "<group>"; };
BCF04C8E11FF9F6E00F86A58 /* WebString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebString.h; sourceTree = "<group>"; };
+ BCF18637167D071E00A1A85A /* CacheModel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheModel.cpp; sourceTree = "<group>"; };
BCF505E51243047B005955AE /* PlatformCertificateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformCertificateInfo.h; sourceTree = "<group>"; };
BCF505E61243047B005955AE /* PlatformCertificateInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformCertificateInfo.mm; sourceTree = "<group>"; };
BCF5068412431861005955AE /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
@@ -2769,6 +2771,7 @@
B63403F814910D57001070B5 /* APIObject.cpp */,
BCF04C8C11FF9B7D00F86A58 /* APIObject.h */,
4F601430155C5A32001FBDE0 /* BlockingResponseMap.h */,
+ BCF18637167D071E00A1A85A /* CacheModel.cpp */,
BC3065F91259344E00E71278 /* CacheModel.h */,
1A2D956E12848564001EB962 /* ChildProcess.cpp */,
1A2D956D12848564001EB962 /* ChildProcess.h */,
@@ -5980,6 +5983,7 @@
31A67E0C165B2A99006CBA66 /* PlugInAutoStartProvider.cpp in Sources */,
31D5929E166E060000E6BF02 /* WebPlugInClient.cpp in Sources */,
1AD25E95167AB08100EA9BCD /* DownloadProxyMap.cpp in Sources */,
+ BCF18638167D071E00A1A85A /* CacheModel.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (137802 => 137803)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2012-12-15 20:13:41 UTC (rev 137802)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2012-12-15 20:26:40 UTC (rev 137803)
@@ -493,150 +493,6 @@
}
}
-void WebProcess::calculateCacheSizes(CacheModel cacheModel, uint64_t memorySize, uint64_t diskFreeSize,
- unsigned& cacheTotalCapacity, unsigned& cacheMinDeadCapacity, unsigned& cacheMaxDeadCapacity, double& deadDecodedDataDeletionInterval,
- unsigned& pageCacheCapacity, unsigned long& urlCacheMemoryCapacity, unsigned long& urlCacheDiskCapacity)
-{
- switch (cacheModel) {
- case CacheModelDocumentViewer: {
- // Page cache capacity (in pages)
- pageCacheCapacity = 0;
-
- // Object cache capacities (in bytes)
- if (memorySize >= 2048)
- cacheTotalCapacity = 96 * 1024 * 1024;
- else if (memorySize >= 1536)
- cacheTotalCapacity = 64 * 1024 * 1024;
- else if (memorySize >= 1024)
- cacheTotalCapacity = 32 * 1024 * 1024;
- else if (memorySize >= 512)
- cacheTotalCapacity = 16 * 1024 * 1024;
-
- cacheMinDeadCapacity = 0;
- cacheMaxDeadCapacity = 0;
-
- // Foundation memory cache capacity (in bytes)
- urlCacheMemoryCapacity = 0;
-
- // Foundation disk cache capacity (in bytes)
- urlCacheDiskCapacity = 0;
-
- break;
- }
- case CacheModelDocumentBrowser: {
- // Page cache capacity (in pages)
- if (memorySize >= 1024)
- pageCacheCapacity = 3;
- else if (memorySize >= 512)
- pageCacheCapacity = 2;
- else if (memorySize >= 256)
- pageCacheCapacity = 1;
- else
- pageCacheCapacity = 0;
-
- // Object cache capacities (in bytes)
- if (memorySize >= 2048)
- cacheTotalCapacity = 96 * 1024 * 1024;
- else if (memorySize >= 1536)
- cacheTotalCapacity = 64 * 1024 * 1024;
- else if (memorySize >= 1024)
- cacheTotalCapacity = 32 * 1024 * 1024;
- else if (memorySize >= 512)
- cacheTotalCapacity = 16 * 1024 * 1024;
-
- cacheMinDeadCapacity = cacheTotalCapacity / 8;
- cacheMaxDeadCapacity = cacheTotalCapacity / 4;
-
- // Foundation memory cache capacity (in bytes)
- if (memorySize >= 2048)
- urlCacheMemoryCapacity = 4 * 1024 * 1024;
- else if (memorySize >= 1024)
- urlCacheMemoryCapacity = 2 * 1024 * 1024;
- else if (memorySize >= 512)
- urlCacheMemoryCapacity = 1 * 1024 * 1024;
- else
- urlCacheMemoryCapacity = 512 * 1024;
-
- // Foundation disk cache capacity (in bytes)
- if (diskFreeSize >= 16384)
- urlCacheDiskCapacity = 50 * 1024 * 1024;
- else if (diskFreeSize >= 8192)
- urlCacheDiskCapacity = 40 * 1024 * 1024;
- else if (diskFreeSize >= 4096)
- urlCacheDiskCapacity = 30 * 1024 * 1024;
- else
- urlCacheDiskCapacity = 20 * 1024 * 1024;
-
- break;
- }
- case CacheModelPrimaryWebBrowser: {
- // Page cache capacity (in pages)
- // (Research indicates that value / page drops substantially after 3 pages.)
- if (memorySize >= 2048)
- pageCacheCapacity = 5;
- else if (memorySize >= 1024)
- pageCacheCapacity = 4;
- else if (memorySize >= 512)
- pageCacheCapacity = 3;
- else if (memorySize >= 256)
- pageCacheCapacity = 2;
- else
- pageCacheCapacity = 1;
-
- // Object cache capacities (in bytes)
- // (Testing indicates that value / MB depends heavily on content and
- // browsing pattern. Even growth above 128MB can have substantial
- // value / MB for some content / browsing patterns.)
- if (memorySize >= 2048)
- cacheTotalCapacity = 128 * 1024 * 1024;
- else if (memorySize >= 1536)
- cacheTotalCapacity = 96 * 1024 * 1024;
- else if (memorySize >= 1024)
- cacheTotalCapacity = 64 * 1024 * 1024;
- else if (memorySize >= 512)
- cacheTotalCapacity = 32 * 1024 * 1024;
-
- cacheMinDeadCapacity = cacheTotalCapacity / 4;
- cacheMaxDeadCapacity = cacheTotalCapacity / 2;
-
- // This code is here to avoid a PLT regression. We can remove it if we
- // can prove that the overall system gain would justify the regression.
- cacheMaxDeadCapacity = std::max(24u, cacheMaxDeadCapacity);
-
- deadDecodedDataDeletionInterval = 60;
-
- // Foundation memory cache capacity (in bytes)
- // (These values are small because WebCore does most caching itself.)
- if (memorySize >= 1024)
- urlCacheMemoryCapacity = 4 * 1024 * 1024;
- else if (memorySize >= 512)
- urlCacheMemoryCapacity = 2 * 1024 * 1024;
- else if (memorySize >= 256)
- urlCacheMemoryCapacity = 1 * 1024 * 1024;
- else
- urlCacheMemoryCapacity = 512 * 1024;
-
- // Foundation disk cache capacity (in bytes)
- if (diskFreeSize >= 16384)
- urlCacheDiskCapacity = 175 * 1024 * 1024;
- else if (diskFreeSize >= 8192)
- urlCacheDiskCapacity = 150 * 1024 * 1024;
- else if (diskFreeSize >= 4096)
- urlCacheDiskCapacity = 125 * 1024 * 1024;
- else if (diskFreeSize >= 2048)
- urlCacheDiskCapacity = 100 * 1024 * 1024;
- else if (diskFreeSize >= 1024)
- urlCacheDiskCapacity = 75 * 1024 * 1024;
- else
- urlCacheDiskCapacity = 50 * 1024 * 1024;
-
- break;
- }
- default:
- ASSERT_NOT_REACHED();
- };
-}
-
WebPage* WebProcess::focusedWebPage() const
{
HashMap<uint64_t, RefPtr<WebPage> >::const_iterator end = m_pageMap.end();
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (137802 => 137803)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2012-12-15 20:13:41 UTC (rev 137802)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2012-12-15 20:26:40 UTC (rev 137803)
@@ -251,9 +251,6 @@
void didAddPlugInAutoStartOrigin(unsigned plugInOriginHash);
void platformSetCacheModel(CacheModel);
- static void calculateCacheSizes(CacheModel cacheModel, uint64_t memorySize, uint64_t diskFreeSize,
- unsigned& cacheTotalCapacity, unsigned& cacheMinDeadCapacity, unsigned& cacheMaxDeadCapacity, double& deadDecodedDataDeletionInterval,
- unsigned& pageCacheCapacity, unsigned long& urlCacheMemoryCapacity, unsigned long& urlCacheDiskCapacity);
void platformClearResourceCaches(ResourceCachesToClear);
void clearApplicationCache();
Modified: trunk/Source/WebKit2/win/WebKit2.vcproj (137802 => 137803)
--- trunk/Source/WebKit2/win/WebKit2.vcproj 2012-12-15 20:13:41 UTC (rev 137802)
+++ trunk/Source/WebKit2/win/WebKit2.vcproj 2012-12-15 20:26:40 UTC (rev 137803)
@@ -411,6 +411,10 @@
>
</File>
<File
+ RelativePath="..\Shared\CacheModel.cpp"
+ >
+ </File>
+ <File
RelativePath="..\Shared\CacheModel.h"
>
</File>
