<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173200] trunk/Source/WebKit/win</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173200">173200</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-02 23:04:44 -0700 (Tue, 02 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WinCairo] Memory cache capacity is not set.
https://bugs.webkit.org/show_bug.cgi?id=136432
Patch by peavo@outlook.com <peavo@outlook.com> on 2014-09-02
Reviewed by Alex Christensen.
Reuse code from AppleWin to set memory and disk cache capacity.
* WebKitSystemBits.cpp:
(WebVolumeFreeSize):
* WebKitSystemBits.h:
* WebView.cpp:
(WebView::setCacheModel):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebKitSystemBitscpp">trunk/Source/WebKit/win/WebKitSystemBits.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebKitSystemBitsh">trunk/Source/WebKit/win/WebKitSystemBits.h</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (173199 => 173200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-09-03 04:58:55 UTC (rev 173199)
+++ trunk/Source/WebKit/win/ChangeLog 2014-09-03 06:04:44 UTC (rev 173200)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-09-02 peavo@outlook.com <peavo@outlook.com>
+
+ [WinCairo] Memory cache capacity is not set.
+ https://bugs.webkit.org/show_bug.cgi?id=136432
+
+ Reviewed by Alex Christensen.
+
+ Reuse code from AppleWin to set memory and disk cache capacity.
+
+ * WebKitSystemBits.cpp:
+ (WebVolumeFreeSize):
+ * WebKitSystemBits.h:
+ * WebView.cpp:
+ (WebView::setCacheModel):
+
</ins><span class="cx"> 2014-08-26 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] WebKit IDL incorrectly passes HWND as OLE_HANDLE
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebKitSystemBitscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitSystemBits.cpp (173199 => 173200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebKitSystemBits.cpp 2014-09-03 04:58:55 UTC (rev 173199)
+++ trunk/Source/WebKit/win/WebKitSystemBits.cpp 2014-09-03 06:04:44 UTC (rev 173200)
</span><span class="lines">@@ -29,9 +29,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebKitSystemBits.h"
</span><span class="cx">
</span><del>-#include <CoreFoundation/CoreFoundation.h>
</del><span class="cx"> #include <windows.h>
</span><del>-#include <wtf/text/WTFString.h>
</del><span class="cx">
</span><span class="cx"> unsigned long long WebMemorySize()
</span><span class="cx"> {
</span><span class="lines">@@ -41,9 +39,8 @@
</span><span class="cx"> return statex.ullTotalPhys;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned long long WebVolumeFreeSize(CFStringRef cfstringPath)
</del><ins>+unsigned long long WebVolumeFreeSize(const String& path)
</ins><span class="cx"> {
</span><del>- WTF::String path(cfstringPath);
</del><span class="cx"> ULARGE_INTEGER freeBytesToCaller;
</span><span class="cx"> BOOL result = GetDiskFreeSpaceExW((LPCWSTR)path.charactersWithNullTermination().data(), &freeBytesToCaller, 0, 0);
</span><span class="cx"> if (!result)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebKitSystemBitsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitSystemBits.h (173199 => 173200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebKitSystemBits.h 2014-09-03 04:58:55 UTC (rev 173199)
+++ trunk/Source/WebKit/win/WebKitSystemBits.h 2014-09-03 06:04:44 UTC (rev 173200)
</span><span class="lines">@@ -29,9 +29,9 @@
</span><span class="cx"> #ifndef WebKitSystemBits_h
</span><span class="cx"> #define WebKitSystemBits_h
</span><span class="cx">
</span><del>-typedef const struct __CFString* CFStringRef;
</del><ins>+#include <wtf/text/WTFString.h>
</ins><span class="cx">
</span><span class="cx"> unsigned long long WebMemorySize();
</span><del>-unsigned long long WebVolumeFreeSize(CFStringRef path);
</del><ins>+unsigned long long WebVolumeFreeSize(const String& path);
</ins><span class="cx">
</span><span class="cx"> #endif // WebKitSystemBits_h
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (173199 => 173200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2014-09-03 04:58:55 UTC (rev 173199)
+++ trunk/Source/WebKit/win/WebView.cpp 2014-09-03 06:04:44 UTC (rev 173200)
</span><span class="lines">@@ -162,7 +162,9 @@
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> #include <CFNetwork/CFURLCachePriv.h>
</span><span class="cx"> #include <CFNetwork/CFURLProtocolPriv.h>
</span><del>-#include <WebKitSystemInterface/WebKitSystemInterface.h>
</del><ins>+#include <WebKitSystemInterface/WebKitSystemInterface.h>
+#elif USE(CURL)
+#include <WebCore/CurlCacheManager.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(CA)
</span><span class="lines">@@ -483,10 +485,12 @@
</span><span class="cx">
</span><span class="cx"> void WebView::setCacheModel(WebCacheModel cacheModel)
</span><span class="cx"> {
</span><del>-#if USE(CFNETWORK)
</del><span class="cx"> if (s_didSetCacheModel && cacheModel == s_cacheModel)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ String cacheDirectory;
+
+#if USE(CFNETWORK)
</ins><span class="cx"> RetainPtr<CFURLCacheRef> cfurlCache = adoptCF(CFURLCacheCopySharedURLCache());
</span><span class="cx"> RetainPtr<CFStringRef> cfurlCacheDirectory = adoptCF(wkCopyFoundationCacheDirectory(0));
</span><span class="cx"> if (!cfurlCacheDirectory) {
</span><span class="lines">@@ -496,11 +500,18 @@
</span><span class="cx"> else
</span><span class="cx"> cfurlCacheDirectory = WebCore::localUserSpecificStorageDirectory().createCFString();
</span><span class="cx"> }
</span><ins>+ cacheDirectory = String(cfurlCacheDirectory);
+#elif USE(CURL)
+ cacheDirectory = CurlCacheManager::getInstance().cacheDirectory();
+#endif
</ins><span class="cx">
</span><ins>+ long cacheMemoryCapacity = 0;
+ long cacheDiskCapacity = 0;
+
</ins><span class="cx"> // As a fudge factor, use 1000 instead of 1024, in case the reported byte
</span><span class="cx"> // count doesn't align exactly to a megabyte boundary.
</span><span class="cx"> unsigned long long memSize = WebMemorySize() / 1024 / 1000;
</span><del>- unsigned long long diskFreeSize = WebVolumeFreeSize(cfurlCacheDirectory.get()) / 1024 / 1000;
</del><ins>+ unsigned long long diskFreeSize = WebVolumeFreeSize(cacheDirectory) / 1024 / 1000;
</ins><span class="cx">
</span><span class="cx"> unsigned cacheTotalCapacity = 0;
</span><span class="cx"> unsigned cacheMinDeadCapacity = 0;
</span><span class="lines">@@ -509,8 +520,6 @@
</span><span class="cx">
</span><span class="cx"> unsigned pageCacheCapacity = 0;
</span><span class="cx">
</span><del>- CFIndex cfurlCacheMemoryCapacity = 0;
- CFIndex cfurlCacheDiskCapacity = 0;
</del><span class="cx">
</span><span class="cx"> switch (cacheModel) {
</span><span class="cx"> case WebCacheModelDocumentViewer: {
</span><span class="lines">@@ -530,12 +539,13 @@
</span><span class="cx"> cacheMinDeadCapacity = 0;
</span><span class="cx"> cacheMaxDeadCapacity = 0;
</span><span class="cx">
</span><del>- // Foundation memory cache capacity (in bytes)
- cfurlCacheMemoryCapacity = 0;
</del><ins>+ // Memory cache capacity (in bytes)
+ cacheMemoryCapacity = 0;
</ins><span class="cx">
</span><ins>+#if USE(CFNETWORK)
</ins><span class="cx"> // Foundation disk cache capacity (in bytes)
</span><del>- cfurlCacheDiskCapacity = CFURLCacheDiskCapacity(cfurlCache.get());
-
</del><ins>+ cacheDiskCapacity = CFURLCacheDiskCapacity(cfurlCache.get());
+#endif
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case WebCacheModelDocumentBrowser: {
</span><span class="lines">@@ -562,25 +572,25 @@
</span><span class="cx"> cacheMinDeadCapacity = cacheTotalCapacity / 8;
</span><span class="cx"> cacheMaxDeadCapacity = cacheTotalCapacity / 4;
</span><span class="cx">
</span><del>- // Foundation memory cache capacity (in bytes)
</del><ins>+ // Memory cache capacity (in bytes)
</ins><span class="cx"> if (memSize >= 2048)
</span><del>- cfurlCacheMemoryCapacity = 4 * 1024 * 1024;
</del><ins>+ cacheMemoryCapacity = 4 * 1024 * 1024;
</ins><span class="cx"> else if (memSize >= 1024)
</span><del>- cfurlCacheMemoryCapacity = 2 * 1024 * 1024;
</del><ins>+ cacheMemoryCapacity = 2 * 1024 * 1024;
</ins><span class="cx"> else if (memSize >= 512)
</span><del>- cfurlCacheMemoryCapacity = 1 * 1024 * 1024;
</del><ins>+ cacheMemoryCapacity = 1 * 1024 * 1024;
</ins><span class="cx"> else
</span><del>- cfurlCacheMemoryCapacity = 512 * 1024;
</del><ins>+ cacheMemoryCapacity = 512 * 1024;
</ins><span class="cx">
</span><del>- // Foundation disk cache capacity (in bytes)
</del><ins>+ // Disk cache capacity (in bytes)
</ins><span class="cx"> if (diskFreeSize >= 16384)
</span><del>- cfurlCacheDiskCapacity = 50 * 1024 * 1024;
</del><ins>+ cacheDiskCapacity = 50 * 1024 * 1024;
</ins><span class="cx"> else if (diskFreeSize >= 8192)
</span><del>- cfurlCacheDiskCapacity = 40 * 1024 * 1024;
</del><ins>+ cacheDiskCapacity = 40 * 1024 * 1024;
</ins><span class="cx"> else if (diskFreeSize >= 4096)
</span><del>- cfurlCacheDiskCapacity = 30 * 1024 * 1024;
</del><ins>+ cacheDiskCapacity = 30 * 1024 * 1024;
</ins><span class="cx"> else
</span><del>- cfurlCacheDiskCapacity = 20 * 1024 * 1024;
</del><ins>+ cacheDiskCapacity = 20 * 1024 * 1024;
</ins><span class="cx">
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -620,30 +630,30 @@
</span><span class="cx">
</span><span class="cx"> deadDecodedDataDeletionInterval = std::chrono::seconds { 60 };
</span><span class="cx">
</span><del>- // Foundation memory cache capacity (in bytes)
</del><ins>+ // Memory cache capacity (in bytes)
</ins><span class="cx"> // (These values are small because WebCore does most caching itself.)
</span><span class="cx"> if (memSize >= 1024)
</span><del>- cfurlCacheMemoryCapacity = 4 * 1024 * 1024;
</del><ins>+ cacheMemoryCapacity = 4 * 1024 * 1024;
</ins><span class="cx"> else if (memSize >= 512)
</span><del>- cfurlCacheMemoryCapacity = 2 * 1024 * 1024;
</del><ins>+ cacheMemoryCapacity = 2 * 1024 * 1024;
</ins><span class="cx"> else if (memSize >= 256)
</span><del>- cfurlCacheMemoryCapacity = 1 * 1024 * 1024;
</del><ins>+ cacheMemoryCapacity = 1 * 1024 * 1024;
</ins><span class="cx"> else
</span><del>- cfurlCacheMemoryCapacity = 512 * 1024;
</del><ins>+ cacheMemoryCapacity = 512 * 1024;
</ins><span class="cx">
</span><del>- // Foundation disk cache capacity (in bytes)
</del><ins>+ // Disk cache capacity (in bytes)
</ins><span class="cx"> if (diskFreeSize >= 16384)
</span><del>- cfurlCacheDiskCapacity = 175 * 1024 * 1024;
</del><ins>+ cacheDiskCapacity = 175 * 1024 * 1024;
</ins><span class="cx"> else if (diskFreeSize >= 8192)
</span><del>- cfurlCacheDiskCapacity = 150 * 1024 * 1024;
</del><ins>+ cacheDiskCapacity = 150 * 1024 * 1024;
</ins><span class="cx"> else if (diskFreeSize >= 4096)
</span><del>- cfurlCacheDiskCapacity = 125 * 1024 * 1024;
</del><ins>+ cacheDiskCapacity = 125 * 1024 * 1024;
</ins><span class="cx"> else if (diskFreeSize >= 2048)
</span><del>- cfurlCacheDiskCapacity = 100 * 1024 * 1024;
</del><ins>+ cacheDiskCapacity = 100 * 1024 * 1024;
</ins><span class="cx"> else if (diskFreeSize >= 1024)
</span><del>- cfurlCacheDiskCapacity = 75 * 1024 * 1024;
</del><ins>+ cacheDiskCapacity = 75 * 1024 * 1024;
</ins><span class="cx"> else
</span><del>- cfurlCacheDiskCapacity = 50 * 1024 * 1024;
</del><ins>+ cacheDiskCapacity = 50 * 1024 * 1024;
</ins><span class="cx">
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -651,20 +661,23 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Don't shrink a big disk cache, since that would cause churn.
- cfurlCacheDiskCapacity = max(cfurlCacheDiskCapacity, CFURLCacheDiskCapacity(cfurlCache.get()));
-
</del><span class="cx"> memoryCache()->setCapacities(cacheMinDeadCapacity, cacheMaxDeadCapacity, cacheTotalCapacity);
</span><span class="cx"> memoryCache()->setDeadDecodedDataDeletionInterval(deadDecodedDataDeletionInterval);
</span><span class="cx"> pageCache()->setCapacity(pageCacheCapacity);
</span><span class="cx">
</span><del>- CFURLCacheSetMemoryCapacity(cfurlCache.get(), cfurlCacheMemoryCapacity);
- CFURLCacheSetDiskCapacity(cfurlCache.get(), cfurlCacheDiskCapacity);
</del><ins>+#if USE(CFNETWORK)
+ // Don't shrink a big disk cache, since that would cause churn.
+ cacheDiskCapacity = max(cacheDiskCapacity, CFURLCacheDiskCapacity(cfurlCache.get()));
</ins><span class="cx">
</span><ins>+ CFURLCacheSetMemoryCapacity(cfurlCache.get(), cacheMemoryCapacity);
+ CFURLCacheSetDiskCapacity(cfurlCache.get(), cacheDiskCapacity);
+#elif USE(CURL)
+ CurlCacheManager::getInstance().setStorageSizeLimit(cacheDiskCapacity);
+#endif
+
</ins><span class="cx"> s_didSetCacheModel = true;
</span><span class="cx"> s_cacheModel = cacheModel;
</span><span class="cx"> return;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebCacheModel WebView::cacheModel()
</span></span></pre>
</div>
</div>
</body>
</html>