<!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>[212081] releases/WebKitGTK/webkit-2.14/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/212081">212081</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-09 23:53:14 -0800 (Thu, 09 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211867">r211867</a> - [GTK] Reduce TiledBackingStore tile coverage when on memory pressure state
https://bugs.webkit.org/show_bug.cgi?id=167980
Reviewed by Carlos Garcia Campos.
Use a smaller coverAreaMultiplier in the TiledBackingStore when in memory pressure situation, to reduce
the amount of tiles created.
No new tests.
* platform/graphics/texmap/coordinated/TiledBackingStore.cpp:
(WebCore::TiledBackingStore::createTilesIfNeeded):
(WebCore::TiledBackingStore::createTiles):
* platform/graphics/texmap/coordinated/TiledBackingStore.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicstexmapcoordinatedTiledBackingStorecpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStore.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicstexmapcoordinatedTiledBackingStoreh">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStore.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (212080 => 212081)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-02-10 07:53:05 UTC (rev 212080)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-02-10 07:53:14 UTC (rev 212081)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-02-08 Miguel Gomez <magomez@igalia.com>
+
+ [GTK] Reduce TiledBackingStore tile coverage when on memory pressure state
+ https://bugs.webkit.org/show_bug.cgi?id=167980
+
+ Reviewed by Carlos Garcia Campos.
+
+ Use a smaller coverAreaMultiplier in the TiledBackingStore when in memory pressure situation, to reduce
+ the amount of tiles created.
+
+ No new tests.
+
+ * platform/graphics/texmap/coordinated/TiledBackingStore.cpp:
+ (WebCore::TiledBackingStore::createTilesIfNeeded):
+ (WebCore::TiledBackingStore::createTiles):
+ * platform/graphics/texmap/coordinated/TiledBackingStore.h:
+
</ins><span class="cx"> 2017-02-09 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Tear down existing renderers when adding a shadow root.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicstexmapcoordinatedTiledBackingStorecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStore.cpp (212080 => 212081)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStore.cpp 2017-02-10 07:53:05 UTC (rev 212080)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStore.cpp 2017-02-10 07:53:14 UTC (rev 212081)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span><span class="cx"> #include "GraphicsContext.h"
</span><ins>+#include "MemoryPressureHandler.h"
</ins><span class="cx"> #include "TiledBackingStoreClient.h"
</span><span class="cx"> #include <wtf/CheckedArithmetic.h>
</span><span class="cx">
</span><span class="lines">@@ -59,10 +60,11 @@
</span><span class="cx"> {
</span><span class="cx"> IntRect scaledContentsRect = mapFromContents(contentsRect);
</span><span class="cx"> IntRect visibleRect = mapFromContents(unscaledVisibleRect);
</span><ins>+ float coverAreaMultiplier = MemoryPressureHandler::singleton().isUnderMemoryPressure() ? 1.0f : 2.0f;
</ins><span class="cx">
</span><del>- bool didChange = m_trajectoryVector != m_pendingTrajectoryVector || m_visibleRect != visibleRect || m_rect != scaledContentsRect;
</del><ins>+ bool didChange = m_trajectoryVector != m_pendingTrajectoryVector || m_visibleRect != visibleRect || m_rect != scaledContentsRect || m_coverAreaMultiplier != coverAreaMultiplier;
</ins><span class="cx"> if (didChange || m_pendingTileCreation)
</span><del>- createTiles(visibleRect, scaledContentsRect);
</del><ins>+ createTiles(visibleRect, scaledContentsRect, coverAreaMultiplier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TiledBackingStore::invalidate(const IntRect& contentsDirtyRect)
</span><span class="lines">@@ -143,7 +145,7 @@
</span><span class="cx"> return coverageRatio(intersection(m_visibleRect, m_rect)) == 1.0f;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TiledBackingStore::createTiles(const IntRect& visibleRect, const IntRect& scaledContentsRect)
</del><ins>+void TiledBackingStore::createTiles(const IntRect& visibleRect, const IntRect& scaledContentsRect, float coverAreaMultiplier)
</ins><span class="cx"> {
</span><span class="cx"> // Update our backing store geometry.
</span><span class="cx"> const IntRect previousRect = m_rect;
</span><span class="lines">@@ -150,6 +152,7 @@
</span><span class="cx"> m_rect = scaledContentsRect;
</span><span class="cx"> m_trajectoryVector = m_pendingTrajectoryVector;
</span><span class="cx"> m_visibleRect = visibleRect;
</span><ins>+ m_coverAreaMultiplier = coverAreaMultiplier;
</ins><span class="cx">
</span><span class="cx"> if (m_rect.isEmpty()) {
</span><span class="cx"> setCoverRect(IntRect());
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicstexmapcoordinatedTiledBackingStoreh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStore.h (212080 => 212081)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStore.h 2017-02-10 07:53:05 UTC (rev 212080)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStore.h 2017-02-10 07:53:14 UTC (rev 212081)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> void setSupportsAlpha(bool);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void createTiles(const IntRect& visibleRect, const IntRect& scaledContentsRect);
</del><ins>+ void createTiles(const IntRect& visibleRect, const IntRect& scaledContentsRect, float coverAreaMultiplier);
</ins><span class="cx"> void computeCoverAndKeepRect(const IntRect& visibleRect, IntRect& coverRect, IntRect& keepRect) const;
</span><span class="cx">
</span><span class="cx"> bool resizeEdgeTiles();
</span></span></pre>
</div>
</div>
</body>
</html>