<!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>[170414] trunk</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/170414">170414</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-06-24 18:25:23 -0700 (Tue, 24 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tiles on bottom of screen are not always allocated when necessary
https://bugs.webkit.org/show_bug.cgi?id=134272
Reviewed by Simon Fraser.
Source/WebCore:
The initial visibleRect is in the coordinate of the root layer, so its origin
is at the top left of the view. The initial rect we were using doesn't
include the contents inset, so it was too short, which was causing tiles near
the bottom of the screen to not always be allocated if the tile threshold was
close to the bottom of the view. Instead, we want to include the contents
inset size so the visible rect includes the entire view.
GraphicsLayerCA::recursiveCommitChanges() takes care of mapping and cropping
the visible rect into the tiled layer's coordinate system, at which point it
is used for visible tile logic.
Test: platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html
* platform/graphics/ca/TileCoverageMap.cpp:
(WebCore::TileCoverageMap::update):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::flushPendingLayerChanges):
LayoutTests:
Apply a content inset, then dump visible rects.
* platform/mac-wk2/tiled-drawing/visible-rect-content-inset-expected.txt: Added.
* platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileCoverageMapcpp">trunk/Source/WebCore/platform/graphics/ca/TileCoverageMap.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingvisiblerectcontentinsetexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingvisiblerectcontentinsethtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (170413 => 170414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-06-25 01:19:25 UTC (rev 170413)
+++ trunk/LayoutTests/ChangeLog 2014-06-25 01:25:23 UTC (rev 170414)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-06-24 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Tiles on bottom of screen are not always allocated when necessary
+ https://bugs.webkit.org/show_bug.cgi?id=134272
+
+ Reviewed by Simon Fraser.
+
+ Apply a content inset, then dump visible rects.
+
+ * platform/mac-wk2/tiled-drawing/visible-rect-content-inset-expected.txt: Added.
+ * platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html: Added.
+
</ins><span class="cx"> 2014-06-24 Samuel White <samuel_white@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Remove tight platform expectation coupling form roles-exposed layout test.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingvisiblerectcontentinsetexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset-expected.txt (0 => 170414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset-expected.txt 2014-06-25 01:25:23 UTC (rev 170414)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+This test applies a content inset and then dumps the layer tree including visible rects. The visible rects should match the expected rects.
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 500.00)
+ (visible rect 0.00, 0.00 800.00 x 500.00)
+ (contentsScale 1.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 500.00)
+ (contentsOpaque 1)
+ (visible rect 0.00, 0.00 800.00 x 500.00)
+ (contentsScale 1.00)
+ (tile cache coverage 0, 0 800 x 500)
+ (tile size 512 x 512)
+ (top left tile 0, 0 tiles grid 2 x 1)
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingvisiblerectcontentinsethtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html (0 => 170414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html 2014-06-25 01:25:23 UTC (rev 170414)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ if (window.internals)
+ window.internals.setTopContentInset(100);
+
+ function doTest()
+ {
+ if (window.internals) {
+ document.getElementById('layers').innerText = internals.layerTreeAsText(document,
+ internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
+ }
+ }
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+This test applies a content inset and then dumps the layer tree including visible rects. The visible rects should match the expected rects.
+<pre id="layers">Layer tree goes here</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170413 => 170414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-25 01:19:25 UTC (rev 170413)
+++ trunk/Source/WebCore/ChangeLog 2014-06-25 01:25:23 UTC (rev 170414)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2014-06-24 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><ins>+ Tiles on bottom of screen are not always allocated when necessary
+ https://bugs.webkit.org/show_bug.cgi?id=134272
+
+ Reviewed by Simon Fraser.
+
+ The initial visibleRect is in the coordinate of the root layer, so its origin
+ is at the top left of the view. The initial rect we were using doesn't
+ include the contents inset, so it was too short, which was causing tiles near
+ the bottom of the screen to not always be allocated if the tile threshold was
+ close to the bottom of the view. Instead, we want to include the contents
+ inset size so the visible rect includes the entire view.
+ GraphicsLayerCA::recursiveCommitChanges() takes care of mapping and cropping
+ the visible rect into the tiled layer's coordinate system, at which point it
+ is used for visible tile logic.
+
+ Test: platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html
+
+ * platform/graphics/ca/TileCoverageMap.cpp:
+ (WebCore::TileCoverageMap::update):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::flushPendingLayerChanges):
+
+2014-06-24 Myles C. Maxfield <mmaxfield@apple.com>
+
</ins><span class="cx"> InlineTextBox's m_len can be an unsigned (rather than an unsigned short)
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134173
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileCoverageMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileCoverageMap.cpp (170413 => 170414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileCoverageMap.cpp 2014-06-25 01:19:25 UTC (rev 170413)
+++ trunk/Source/WebCore/platform/graphics/ca/TileCoverageMap.cpp 2014-06-25 01:25:23 UTC (rev 170414)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> FloatRect containerBounds = m_controller.bounds();
</span><span class="cx"> FloatRect visibleRect = m_controller.visibleRect();
</span><span class="cx"> visibleRect.contract(4, 4); // Layer is positioned 2px from top and left edges.
</span><del>- visibleRect.setHeight(visibleRect.height() - m_controller.topContentInset());
</del><span class="cx">
</span><span class="cx"> float widthScale = 1;
</span><span class="cx"> float scale = 1;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (170413 => 170414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-06-25 01:19:25 UTC (rev 170413)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-06-25 01:25:23 UTC (rev 170414)
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx"> rootLayer->flushCompositingState(visibleRect);
</span><span class="cx"> #else
</span><span class="cx"> // Having a m_clipLayer indicates that we're doing scrolling via GraphicsLayers.
</span><del>- IntRect visibleRect = m_clipLayer ? IntRect(IntPoint(), frameView.contentsSize()) : frameView.visibleContentRect();
</del><ins>+ IntRect visibleRect = m_clipLayer ? IntRect(IntPoint(), frameView.unscaledTotalVisibleContentSize()) : frameView.visibleContentRect();
</ins><span class="cx"> if (!frameView.exposedRect().isInfinite())
</span><span class="cx"> visibleRect.intersect(IntRect(frameView.exposedRect()));
</span><span class="cx"> rootLayer->flushCompositingState(visibleRect);
</span></span></pre>
</div>
</div>
</body>
</html>