<!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>[183213] trunk/Source/WebCore</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/183213">183213</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-23 14:58:48 -0700 (Thu, 23 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/183194">r183194</a>.
https://bugs.webkit.org/show_bug.cgi?id=144121
Made multiple tests flaky (Requested by ap_ on #webkit).
Reverted changeset:
"Memory cache live resources repeatedly purged during
painting"
https://bugs.webkit.org/show_bug.cgi?id=144104
http://trac.webkit.org/changeset/183194</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCachecpp">trunk/Source/WebCore/loader/cache/MemoryCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCacheh">trunk/Source/WebCore/loader/cache/MemoryCache.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183212 => 183213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-23 21:56:23 UTC (rev 183212)
+++ trunk/Source/WebCore/ChangeLog 2015-04-23 21:58:48 UTC (rev 183213)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-04-23 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r183194.
+ https://bugs.webkit.org/show_bug.cgi?id=144121
+
+ Made multiple tests flaky (Requested by ap_ on #webkit).
+
+ Reverted changeset:
+
+ "Memory cache live resources repeatedly purged during
+ painting"
+ https://bugs.webkit.org/show_bug.cgi?id=144104
+ http://trac.webkit.org/changeset/183194
+
</ins><span class="cx"> 2015-04-23 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Missed a button in r182900.
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (183212 => 183213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2015-04-23 21:56:23 UTC (rev 183212)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2015-04-23 21:58:48 UTC (rev 183213)
</span><span class="lines">@@ -460,7 +460,7 @@
</span><span class="cx"> // We allow non-secure content to be reused in history, but we do not allow secure content to be reused.
</span><span class="cx"> memoryCache.remove(*this);
</span><span class="cx"> }
</span><del>- memoryCache.pruneSoon();
</del><ins>+ memoryCache.prune();
</ins><span class="cx"> }
</span><span class="cx"> // This object may be dead here.
</span><span class="cx"> }
</span><span class="lines">@@ -557,7 +557,7 @@
</span><span class="cx"> memoryCache.removeFromLiveDecodedResourcesList(*this);
</span><span class="cx"> memoryCache.insertInLiveDecodedResourcesList(*this);
</span><span class="cx"> }
</span><del>- memoryCache.pruneSoon();
</del><ins>+ memoryCache.prune();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (183212 => 183213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2015-04-23 21:56:23 UTC (rev 183212)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2015-04-23 21:58:48 UTC (rev 183213)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><del>-#include <wtf/RunLoop.h>
</del><span class="cx"> #include <wtf/TemporaryChange.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="lines">@@ -51,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> static const int cDefaultCacheCapacity = 8192 * 1024;
</span><span class="cx"> static const double cMinDelayBeforeLiveDecodedPrune = 1; // Seconds.
</span><del>-static const float cTargetPrunePercentage = 0.8; // Percentage of capacity toward which we prune, to avoid immediately pruning again.
</del><ins>+static const float cTargetPrunePercentage = .95f; // Percentage of capacity toward which we prune, to avoid immediately pruning again.
</ins><span class="cx"> static const auto defaultDecodedDataDeletionInterval = std::chrono::seconds { 0 };
</span><span class="cx">
</span><span class="cx"> MemoryCache& MemoryCache::singleton()
</span><span class="lines">@@ -746,34 +745,15 @@
</span><span class="cx"> ASSERT(!m_sessionResources.contains(sessionID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MemoryCache::needsPruning() const
-{
- return m_liveSize + m_deadSize > m_capacity || m_deadSize > m_maxDeadCapacity;
-}
-
</del><span class="cx"> void MemoryCache::prune()
</span><span class="cx"> {
</span><del>- if (!needsPruning())
</del><ins>+ if (m_liveSize + m_deadSize <= m_capacity && m_deadSize <= m_maxDeadCapacity) // Fast path.
</ins><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> pruneDeadResources(); // Prune dead first, in case it was "borrowing" capacity from live.
</span><span class="cx"> pruneLiveResources();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MemoryCache::pruneSoon()
-{
- if (m_willPruneSoon)
- return;
- if (!needsPruning())
- return;
-
- m_willPruneSoon = true;
- RunLoop::main().dispatch([this] {
- prune();
- m_willPruneSoon = false;
- });
-}
-
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> void MemoryCache::dumpStats()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.h (183212 => 183213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.h 2015-04-23 21:56:23 UTC (rev 183212)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.h 2015-04-23 21:58:48 UTC (rev 183213)
</span><span class="lines">@@ -115,9 +115,8 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void evictResources();
</span><span class="cx"> WEBCORE_EXPORT void evictResources(SessionID);
</span><del>-
</del><ins>+
</ins><span class="cx"> void prune();
</span><del>- void pruneSoon();
</del><span class="cx"> unsigned size() const { return m_liveSize + m_deadSize; }
</span><span class="cx">
</span><span class="cx"> void setDeadDecodedDataDeletionInterval(std::chrono::milliseconds interval) { m_deadDecodedDataDeletionInterval = interval; }
</span><span class="lines">@@ -185,7 +184,6 @@
</span><span class="cx">
</span><span class="cx"> unsigned liveCapacity() const;
</span><span class="cx"> unsigned deadCapacity() const;
</span><del>- bool needsPruning() const;
</del><span class="cx">
</span><span class="cx"> CachedResource* resourceForRequestImpl(const ResourceRequest&, CachedResourceMap&);
</span><span class="cx">
</span><span class="lines">@@ -215,8 +213,6 @@
</span><span class="cx"> // referenced by a Web page).
</span><span class="cx"> typedef HashMap<SessionID, std::unique_ptr<CachedResourceMap>> SessionCachedResourceMap;
</span><span class="cx"> SessionCachedResourceMap m_sessionResources;
</span><del>-
- bool m_willPruneSoon { false };
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>