<!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>[197254] 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/197254">197254</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2016-02-27 09:49:29 -0800 (Sat, 27 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Discard decoded image data on top-level navigation.
<https://webkit.org/b/154776>
Reviewed by Anders Carlsson.
Add a mechanism that destroys decoded data for all CachedImages and invoke it
when performing a top-level navigation on iOS.
This substantially reduces the ImageIO contribution to our peak memory footprint.
It would be even better if we could mark these images volatile during the transition
but we currently don't have framework support for such machinations.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::commitProvisionalLoad):
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::forEachResource):
(WebCore::MemoryCache::destroyDecodedDataForAllImages):
* loader/cache/MemoryCache.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.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 (197253 => 197254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-27 15:10:10 UTC (rev 197253)
+++ trunk/Source/WebCore/ChangeLog 2016-02-27 17:49:29 UTC (rev 197254)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-02-27 Andreas Kling <akling@apple.com>
+
+ [iOS] Discard decoded image data on top-level navigation.
+ <https://webkit.org/b/154776>
+
+ Reviewed by Anders Carlsson.
+
+ Add a mechanism that destroys decoded data for all CachedImages and invoke it
+ when performing a top-level navigation on iOS.
+
+ This substantially reduces the ImageIO contribution to our peak memory footprint.
+
+ It would be even better if we could mark these images volatile during the transition
+ but we currently don't have framework support for such machinations.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::commitProvisionalLoad):
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::MemoryCache::forEachResource):
+ (WebCore::MemoryCache::destroyDecodedDataForAllImages):
+ * loader/cache/MemoryCache.h:
+
</ins><span class="cx"> 2016-02-26 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Network cache: old pages returned by disk cache on history navigation after session is restored
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (197253 => 197254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2016-02-27 15:10:10 UTC (rev 197253)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2016-02-27 17:49:29 UTC (rev 197254)
</span><span class="lines">@@ -1766,6 +1766,10 @@
</span><span class="cx"> // For top-level navigations, have JSC throw away linked code. The immediate memory savings far
</span><span class="cx"> // outweigh the cost of recompiling in the case of a future backwards navigation.
</span><span class="cx"> GCController::singleton().deleteAllLinkedCode();
</span><ins>+
+ // Throw out decoded data for CachedImages when we are switching pages. The majority of it
+ // will not be used by the next page.
+ MemoryCache::singleton().destroyDecodedDataForAllImages();
</ins><span class="cx"> #endif
</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 (197253 => 197254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2016-02-27 15:10:10 UTC (rev 197253)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2016-02-27 17:49:29 UTC (rev 197254)
</span><span class="lines">@@ -277,6 +277,22 @@
</span><span class="cx"> pruneLiveResourcesToSize(targetSize, shouldDestroyDecodedDataForAllLiveResources);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MemoryCache::forEachResource(const std::function<void(CachedResource&)>& function)
+{
+ for (auto& lruList : m_allResources) {
+ for (auto& resource : *lruList)
+ function(*resource);
+ }
+}
+
+void MemoryCache::destroyDecodedDataForAllImages()
+{
+ MemoryCache::singleton().forEachResource([](CachedResource& resource) {
+ if (resource.isImage())
+ resource.destroyDecodedData();
+ });
+}
+
</ins><span class="cx"> void MemoryCache::pruneLiveResourcesToSize(unsigned targetSize, bool shouldDestroyDecodedDataForAllLiveResources)
</span><span class="cx"> {
</span><span class="cx"> if (m_inPruneResources)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.h (197253 => 197254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.h 2016-02-27 15:10:10 UTC (rev 197253)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.h 2016-02-27 17:49:29 UTC (rev 197254)
</span><span class="lines">@@ -101,6 +101,9 @@
</span><span class="cx">
</span><span class="cx"> void revalidationSucceeded(CachedResource& revalidatingResource, const ResourceResponse&);
</span><span class="cx"> void revalidationFailed(CachedResource& revalidatingResource);
</span><ins>+
+ void forEachResource(const std::function<void(CachedResource&)>&);
+ void destroyDecodedDataForAllImages();
</ins><span class="cx">
</span><span class="cx"> // Sets the cache's memory capacities, in bytes. These will hold only approximately,
</span><span class="cx"> // since the decoded cost of resources like scripts and stylesheets is not known.
</span></span></pre>
</div>
</div>
</body>
</html>