<!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>[196753] 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/196753">196753</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2016-02-18 03:13:02 -0800 (Thu, 18 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reduce tiling coverage immediately when memory pressure hits.
<https://webkit.org/b/154374>
Reviewed by Simon Fraser.
We already had a policy that reduced tiling coverage to a minimum while the system
is under memory pressure. However, that policy wouldn't kick in immediately after
receiving the pressure notification, but the next time we flush compositing state.
This change makes it happen sooner, improving our chances to escape death!
* page/Page.h:
* page/Page.cpp:
(WebCore::Page::forEachPage):
Add a little helper for visiting every Page.
* platform/MemoryPressureHandler.cpp:
(WebCore::MemoryPressureHandler::releaseCriticalMemory):
When under critical memory pressure, schedule a compositing flush in all Pages.
This ensures that the reduced tiling coverage policy takes effect, allowing us to
immediately drop several tiles in each visible web view.
* platform/cocoa/MemoryPressureHandlerCocoa.mm:
(WebCore::MemoryPressureHandler::install):
To ensure that this behavior is testable with the fake memory pressure notification,
make the fake handler set the "in memory pressure" state just like the real one would.
I don't know why we were not doing this previously, it was just an oversight.
After the simulation completes, it schedules a runloop callback that resets the
"in memory pressure" state.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCoreplatformMemoryPressureHandlercpp">trunk/Source/WebCore/platform/MemoryPressureHandler.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaMemoryPressureHandlerCocoamm">trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196752 => 196753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-18 10:34:47 UTC (rev 196752)
+++ trunk/Source/WebCore/ChangeLog 2016-02-18 11:13:02 UTC (rev 196753)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2016-02-18 Andreas Kling <akling@apple.com>
+
+ Reduce tiling coverage immediately when memory pressure hits.
+ <https://webkit.org/b/154374>
+
+ Reviewed by Simon Fraser.
+
+ We already had a policy that reduced tiling coverage to a minimum while the system
+ is under memory pressure. However, that policy wouldn't kick in immediately after
+ receiving the pressure notification, but the next time we flush compositing state.
+
+ This change makes it happen sooner, improving our chances to escape death!
+
+ * page/Page.h:
+ * page/Page.cpp:
+ (WebCore::Page::forEachPage):
+
+ Add a little helper for visiting every Page.
+
+ * platform/MemoryPressureHandler.cpp:
+ (WebCore::MemoryPressureHandler::releaseCriticalMemory):
+
+ When under critical memory pressure, schedule a compositing flush in all Pages.
+ This ensures that the reduced tiling coverage policy takes effect, allowing us to
+ immediately drop several tiles in each visible web view.
+
+ * platform/cocoa/MemoryPressureHandlerCocoa.mm:
+ (WebCore::MemoryPressureHandler::install):
+
+ To ensure that this behavior is testable with the fake memory pressure notification,
+ make the fake handler set the "in memory pressure" state just like the real one would.
+ I don't know why we were not doing this previously, it was just an oversight.
+ After the simulation completes, it schedules a runloop callback that resets the
+ "in memory pressure" state.
+
</ins><span class="cx"> 2016-02-17 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Font Loading] Implement FontFaceSet
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (196752 => 196753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2016-02-18 10:34:47 UTC (rev 196752)
+++ trunk/Source/WebCore/page/Page.cpp 2016-02-18 11:13:02 UTC (rev 196753)
</span><span class="lines">@@ -126,6 +126,14 @@
</span><span class="cx">
</span><span class="cx"> DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, pageCounter, ("Page"));
</span><span class="cx">
</span><ins>+void Page::forEachPage(std::function<void(Page&)> function)
+{
+ if (!allPages)
+ return;
+ for (Page* page : *allPages)
+ function(*page);
+}
+
</ins><span class="cx"> static void networkStateChanged(bool isOnLine)
</span><span class="cx"> {
</span><span class="cx"> Vector<Ref<Frame>> frames;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (196752 => 196753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2016-02-18 10:34:47 UTC (rev 196752)
+++ trunk/Source/WebCore/page/Page.h 2016-02-18 11:13:02 UTC (rev 196753)
</span><span class="lines">@@ -176,6 +176,8 @@
</span><span class="cx"> PageGroup& group();
</span><span class="cx"> PageGroup* groupPtr() { return m_group; } // can return 0
</span><span class="cx">
</span><ins>+ static void forEachPage(std::function<void(Page&)>);
+
</ins><span class="cx"> void incrementSubframeCount() { ++m_subframeCount; }
</span><span class="cx"> void decrementSubframeCount() { ASSERT(m_subframeCount); --m_subframeCount; }
</span><span class="cx"> int subframeCount() const { checkSubframeCountConsistency(); return m_subframeCount; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMemoryPressureHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.cpp (196752 => 196753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2016-02-18 10:34:47 UTC (rev 196752)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2016-02-18 11:13:02 UTC (rev 196753)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx"> #include "MemoryPressureHandler.h"
</span><span class="cx">
</span><span class="cx"> #include "CSSValuePool.h"
</span><ins>+#include "Chrome.h"
+#include "ChromeClient.h"
</ins><span class="cx"> #include "DOMWindow.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "FontCache.h"
</span><span class="lines">@@ -156,6 +158,11 @@
</span><span class="cx"> GCController::singleton().garbageCollectNow();
</span><span class="cx"> } else
</span><span class="cx"> GCController::singleton().garbageCollectNowIfNotDoneRecently();
</span><ins>+
+ // We reduce tiling coverage while under memory pressure, so make sure to drop excess tiles ASAP.
+ Page::forEachPage([](Page& page) {
+ page.chrome().client().scheduleCompositingLayerFlush();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MemoryPressureHandler::releaseMemory(Critical critical, Synchronous synchronous)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaMemoryPressureHandlerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm (196752 => 196753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2016-02-18 10:34:47 UTC (rev 196752)
+++ trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2016-02-18 11:13:02 UTC (rev 196753)
</span><span class="lines">@@ -128,11 +128,19 @@
</span><span class="cx">
</span><span class="cx"> // Allow simulation of memory pressure with "notifyutil -p org.WebKit.lowMemory"
</span><span class="cx"> notify_register_dispatch("org.WebKit.lowMemory", &_notifyToken, dispatch_get_main_queue(), ^(int) {
</span><ins>+ bool wasUnderMemoryPressure = m_underMemoryPressure;
+ m_underMemoryPressure = true;
+
</ins><span class="cx"> MemoryPressureHandler::singleton().respondToMemoryPressure(Critical::Yes, Synchronous::Yes);
</span><span class="cx">
</span><span class="cx"> WTF::releaseFastMallocFreeMemory();
</span><span class="cx">
</span><span class="cx"> malloc_zone_pressure_relief(nullptr, 0);
</span><ins>+
+ // Since this is a simulation, unset the "under memory pressure" flag on next runloop.
+ dispatch_async(dispatch_get_main_queue(), ^{
+ MemoryPressureHandler::singleton().setUnderMemoryPressure(wasUnderMemoryPressure);
+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> m_installed = true;
</span></span></pre>
</div>
</div>
</body>
</html>