<!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>[212495] branches/safari-603-branch</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/212495">212495</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-16 16:56:17 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212152">r212152</a>. rdar://problem/30459055</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<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>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtilecoverageiframetozerocoverageexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-iframe-to-zero-coverage-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtilecoverageiframetozerocoveragehtml">branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-iframe-to-zero-coverage.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (212494 => 212495)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-17 00:56:14 UTC (rev 212494)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-17 00:56:17 UTC (rev 212495)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r212152. rdar://problem/30459055
+
+ 2017-02-09 Simon Fraser <simon.fraser@apple.com>
+
+ Tiled layers are sometimes left with some tiles when outside the viewport
+ https://bugs.webkit.org/show_bug.cgi?id=168104
+
+ Reviewed by Tim Horton.
+
+ * tiled-drawing/tile-coverage-iframe-to-zero-coverage-expected.txt: Added.
+ * tiled-drawing/tile-coverage-iframe-to-zero-coverage.html: Added.
+
+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211662. rdar://problem/30467322
</span><span class="cx">
</span><span class="cx"> 2017-02-03 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtilecoverageiframetozerocoverageexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-iframe-to-zero-coverage-expected.txt (0 => 212495)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-iframe-to-zero-coverage-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-iframe-to-zero-coverage-expected.txt 2017-02-17 00:56:17 UTC (rev 212495)
</span><span class="lines">@@ -0,0 +1,104 @@
</span><ins>+
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 858.00 5016.00)
+ (visible rect 0.00, 3000.00 785.00 x 585.00)
+ (coverage rect 0.00, 3000.00 785.00 x 585.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 858.00 5016.00)
+ (contentsOpaque 1)
+ (visible rect 0.00, 3000.00 785.00 x 585.00)
+ (coverage rect 0.00, 3000.00 785.00 x 585.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ (tile cache coverage 0, 2560 858 x 1536)
+ (tile size 512 x 512)
+ (top left tile 0, 5 tiles grid 2 x 3)
+ (in window 1)
+ (children 1
+ (GraphicsLayer
+ (position 1.00 1.00)
+ (bounds 857.00 464.00)
+ (drawsContent 1)
+ (visible rect 0.00, 0.00 0.00 x 0.00)
+ (coverage rect -1.00, 2999.00 785.00 x 585.00)
+ (intersects coverage rect 0)
+ (contentsScale 1.00)
+ (children 1
+ (GraphicsLayer
+ (position 32.00 32.00)
+ (visible rect 0.00, 0.00 0.00 x 0.00)
+ (coverage rect -33.00, 2967.00 785.00 x 585.00)
+ (intersects coverage rect 0)
+ (contentsScale 1.00)
+ (children 1
+ (GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 400.00)
+ (visible rect 0.00, 0.00 0.00 x 0.00)
+ (coverage rect 0.00, 0.00 0.00 x 0.00)
+ (intersects coverage rect 0)
+ (contentsScale 1.00)
+ (children 1
+ (GraphicsLayer
+ (visible rect 0.00, 0.00 0.00 x 0.00)
+ (coverage rect 0.00, 0.00 0.00 x 0.00)
+ (intersects coverage rect 0)
+ (contentsScale 1.00)
+ (children 1
+ (GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 2508.00 400.00)
+ (visible rect 0.00, 0.00 0.00 x 0.00)
+ (coverage rect 0.00, 0.00 0.00 x 0.00)
+ (intersects coverage rect 0)
+ (contentsScale 1.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 2508.00 400.00)
+ (usingTiledLayer 1)
+ (drawsContent 1)
+ (visible rect 0.00, 0.00 0.00 x 0.00)
+ (coverage rect 0.00, 0.00 0.00 x 0.00)
+ (intersects coverage rect 0)
+ (contentsScale 1.00)
+ (tile cache coverage 0, 0 0 x 0)
+ (tile size 512 x 512)
+ (top left tile 0, 0 tiles grid 0 x 0)
+ (in window 1)
+ (children 1
+ (GraphicsLayer
+ (position 8.00 8.00)
+ (bounds 2500.00 200.00)
+ (usingTiledLayer 1)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ (visible rect 0.00, 0.00 0.00 x 0.00)
+ (coverage rect -8.00, -8.00 0.00 x 0.00)
+ (intersects coverage rect 0)
+ (contentsScale 1.00)
+ (tile cache coverage 0, 0 0 x 0)
+ (tile size 512 x 512)
+ (top left tile 0, 0 tiles grid 0 x 0)
+ (in window 1)
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtilecoverageiframetozerocoveragehtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-iframe-to-zero-coverage.html (0 => 212495)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-iframe-to-zero-coverage.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-iframe-to-zero-coverage.html 2017-02-17 00:56:17 UTC (rev 212495)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ body {
+ height: 5000px;
+ }
+ iframe {
+ height: 400px;
+ width: 800px;
+ border: 5px solid black;
+ box-shadow: 0 0 5px black;
+ padding: 20px;
+ }
+ </style>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function doTest()
+ {
+ setTimeout(function() {
+ window.scrollTo(0, 3000);
+ if (window.internals) {
+ document.getElementById('layers').innerText = internals.layerTreeAsText(document,
+ internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
+ }
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+ }
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+
+<iframe scrolling="no" srcdoc="<div style='width: 2500px; height: 200px; background-color: silver; will-change: transform'>Stuff here</div>"></iframe>
+<pre id="layers">Layer tree goes here</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212494 => 212495)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-17 00:56:14 UTC (rev 212494)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-17 00:56:17 UTC (rev 212495)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r212152. rdar://problem/30459055
+
+ 2017-02-09 Simon Fraser <simon.fraser@apple.com>
+
+ Tiled layers are sometimes left with some tiles when outside the viewport
+ https://bugs.webkit.org/show_bug.cgi?id=168104
+ rdar://problem/30459055
+
+ Reviewed by Tim Horton.
+
+ When the coverage rect of a TiledBacking goes from a non-empty rect to an empty rect, we
+ shouldn't just early return from TileGrid::revalidateTiles(), otherwise we are left with some
+ tiles. Run through the function as normal, which will remove all the tiles for an empty coverage rect.
+
+ Minor logging changes.
+
+ Test: tiled-drawing/tile-coverage-iframe-to-zero-coverage.html
+
+ * platform/graphics/ca/TileGrid.cpp:
+ (WebCore::TileGrid::revalidateTiles):
+
+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r212151. rdar://problem/30090186
</span><span class="cx">
</span><span class="cx"> 2017-02-10 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformgraphicscaTileGridcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/graphics/ca/TileGrid.cpp (212494 => 212495)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/graphics/ca/TileGrid.cpp 2017-02-17 00:56:14 UTC (rev 212494)
+++ branches/safari-603-branch/Source/WebCore/platform/graphics/ca/TileGrid.cpp 2017-02-17 00:56:17 UTC (rev 212495)
</span><span class="lines">@@ -352,11 +352,8 @@
</span><span class="cx"> FloatRect coverageRect = m_controller.coverageRect();
</span><span class="cx"> IntRect bounds = m_controller.bounds();
</span><span class="cx">
</span><del>- LOG_WITH_STREAM(Tiling, stream << "TileGrid " << this << " revalidateTiles: bounds " << bounds << " coverageRect" << coverageRect << " validation: " << validationPolicyAsString(validationPolicy));
</del><ins>+ LOG_WITH_STREAM(Tiling, stream << "TileGrid " << this << " (controller " << &m_controller << ") revalidateTiles: bounds " << bounds << " coverageRect" << coverageRect << " validation: " << validationPolicyAsString(validationPolicy));
</ins><span class="cx">
</span><del>- if (coverageRect.isEmpty() || bounds.isEmpty())
- return;
-
</del><span class="cx"> FloatRect scaledRect(coverageRect);
</span><span class="cx"> scaledRect.scale(m_scale);
</span><span class="cx"> IntRect coverageRectInTileCoords(enclosingIntRect(scaledRect));
</span></span></pre>
</div>
</div>
</body>
</html>