<!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>[210636] branches/safari-603-branch/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/210636">210636</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-12 08:44:46 -0800 (Thu, 12 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210094">r210094</a>. rdar://problem/29912214</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformgraphicscaTileGridcpp">branches/safari-603-branch/Source/WebCore/platform/graphics/ca/TileGrid.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210635 => 210636)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-12 16:44:44 UTC (rev 210635)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-12 16:44:46 UTC (rev 210636)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210094. rdar://problem/29912214
+
+ 2016-12-21 Tim Horton <timothy_horton@apple.com>
+
+ TileGrid creates new tiles when there are recyclable tiles about to be removed
+ https://bugs.webkit.org/show_bug.cgi?id=166408
+
+ Reviewed by Simon Fraser.
+
+ No new tests; existing tests cover this code, this is just a perf win,
+ specifically reducing the amount of layer churn during zooming.
+
+ * platform/graphics/ca/TileGrid.cpp:
+ (WebCore::TileGrid::revalidateTiles):
+ Remove all the tiles that will be removed first, then add new tiles.
+ Strictly ordering it this way means that tiles will be removed, go into
+ the LayerPool, then be pulled back out of the LayerPool to sit in the
+ newly-covered areas. Previously, we would sometimes make new layers
+ for newly-covered areas, and then remove unneeded but otherwise recyclable
+ tiles, which would then just go sit in the LayerPool (and often get
+ pruned, wastefully).
+
+2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210078. rdar://problem/29633667
</span><span class="cx">
</span><span class="cx"> 2016-12-21 Ryosuke Niwa <rniwa@webkit.org>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformgraphicscaTileGridcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/graphics/ca/TileGrid.cpp (210635 => 210636)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/graphics/ca/TileGrid.cpp 2017-01-12 16:44:44 UTC (rev 210635)
+++ branches/safari-603-branch/Source/WebCore/platform/graphics/ca/TileGrid.cpp 2017-01-12 16:44:46 UTC (rev 210636)
</span><span class="lines">@@ -406,19 +406,9 @@
</span><span class="cx"> removeTilesInCohort(currCohort);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Ensure primary tile coverage tiles.
- m_primaryTileCoverageRect = ensureTilesForRect(coverageRect, CoverageType::PrimaryTiles);
-
</del><span class="cx"> if (validationPolicy & PruneSecondaryTiles) {
</span><span class="cx"> removeAllSecondaryTiles();
</span><span class="cx"> m_cohortList.clear();
</span><del>- } else {
- for (auto& secondaryCoverageRect : m_secondaryTileCoverageRects) {
- FloatRect secondaryRectInLayerCoordinates(secondaryCoverageRect);
- secondaryRectInLayerCoordinates.scale(1 / m_scale);
- ensureTilesForRect(secondaryRectInLayerCoordinates, CoverageType::SecondaryTiles);
- }
- m_secondaryTileCoverageRects.clear();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_controller.unparentsOffscreenTiles() && (validationPolicy & UnparentAllTiles)) {
</span><span class="lines">@@ -465,6 +455,19 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Ensure primary tile coverage tiles.
+ m_primaryTileCoverageRect = ensureTilesForRect(coverageRect, CoverageType::PrimaryTiles);
+
+ // Ensure secondary tiles (requested via prepopulateRect).
+ if (!(validationPolicy & PruneSecondaryTiles)) {
+ for (auto& secondaryCoverageRect : m_secondaryTileCoverageRects) {
+ FloatRect secondaryRectInLayerCoordinates(secondaryCoverageRect);
+ secondaryRectInLayerCoordinates.scale(1 / m_scale);
+ ensureTilesForRect(secondaryRectInLayerCoordinates, CoverageType::SecondaryTiles);
+ }
+ m_secondaryTileCoverageRects.clear();
+ }
+
</ins><span class="cx"> m_controller.didRevalidateTiles();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>