<!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>[209456] 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/209456">209456</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2016-12-07 08:27:34 -0800 (Wed, 07 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Remove bitrotted FrameLoader attempt to limit page caching under memory pressure.
<https://webkit.org/b/165527>
Reviewed by Antti Koivisto.
This code no longer does anything, as the page cache is hard capped
at 0 entries while under memory pressure.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::commitProvisionalLoad):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209455 => 209456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-07 15:32:27 UTC (rev 209455)
+++ trunk/Source/WebCore/ChangeLog 2016-12-07 16:27:34 UTC (rev 209456)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-12-07 Andreas Kling <akling@apple.com>
+
+ [iOS] Remove bitrotted FrameLoader attempt to limit page caching under memory pressure.
+ <https://webkit.org/b/165527>
+
+ Reviewed by Antti Koivisto.
+
+ This code no longer does anything, as the page cache is hard capped
+ at 0 entries while under memory pressure.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::commitProvisionalLoad):
+
</ins><span class="cx"> 2016-12-06 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Use tap and pinch gestures on iOS
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (209455 => 209456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2016-12-07 15:32:27 UTC (rev 209455)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2016-12-07 16:27:34 UTC (rev 209456)
</span><span class="lines">@@ -136,7 +136,6 @@
</span><span class="cx"> #include "DocumentType.h"
</span><span class="cx"> #include "ResourceLoader.h"
</span><span class="cx"> #include "RuntimeApplicationChecks.h"
</span><del>-#include "SystemMemory.h"
</del><span class="cx"> #include "WKContentObservation.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -149,10 +148,6 @@
</span><span class="cx">
</span><span class="cx"> static const char defaultAcceptHeader[] = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-const int memoryLevelThresholdToPrunePageCache = 20;
-#endif
-
</del><span class="cx"> bool isBackForwardLoadType(FrameLoadType type)
</span><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="lines">@@ -1766,27 +1761,6 @@
</span><span class="cx"> m_frame.document() ? m_frame.document()->url().stringCenterEllipsizedToLength().utf8().data() : "",
</span><span class="cx"> pdl ? pdl->url().stringCenterEllipsizedToLength().utf8().data() : "<no provisional DocumentLoader>");
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- // In the case where we are not navigating to a cached page, and the system is under (speculative) memory pressure,
- // we can try to preemptively release some of the pages in the cache.
- // FIXME: Right now the capacity is 1 on iOS devices with 256 MB of RAM, so this will always blow away the whole
- // page cache. We could still preemptively prune the page cache while navigating to a cached page if capacity > 1.
- // See <rdar://problem/11779846> for more details.
- if (!cachedPage) {
- if (MemoryPressureHandler::singleton().isUnderMemoryPressure()) {
- LOG(MemoryPressure, "Pruning page cache because under memory pressure at: %s", __PRETTY_FUNCTION__);
- LOG(PageCache, "Pruning page cache to 0 due to memory pressure");
- // Don't cache any page if we are under memory pressure.
- PageCache::singleton().pruneToSizeNow(0, PruningReason::MemoryPressure);
- } else if (systemMemoryLevel() <= memoryLevelThresholdToPrunePageCache) {
- LOG(MemoryPressure, "Pruning page cache because system memory level is %d at: %s", systemMemoryLevel(), __PRETTY_FUNCTION__);
- auto& pageCache = PageCache::singleton();
- LOG(PageCache, "Pruning page cache to %d due to low memory (level %d less or equal to %d threshold)", pageCache.maxSize() / 2, systemMemoryLevel(), memoryLevelThresholdToPrunePageCache);
- pageCache.pruneToSizeNow(pageCache.maxSize() / 2, PruningReason::MemoryPressure);
- }
- }
-#endif
-
</del><span class="cx"> willTransitionToCommitted();
</span><span class="cx">
</span><span class="cx"> if (!m_frame.tree().parent() && history().currentItem()) {
</span></span></pre>
</div>
</div>
</body>
</html>