<!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>[169564] 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/169564">169564</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-06-03 11:13:28 -0700 (Tue, 03 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TileGrid::prepopulateRect populates the wrong tiles if scale != 1
https://bugs.webkit.org/show_bug.cgi?id=133470
Reviewed by Simon Fraser.
* page/FrameView.cpp:
(WebCore::FrameView::requestScrollPositionUpdate):
* platform/graphics/ca/mac/TileGrid.mm:
(WebCore::TileGrid::prepopulateRect):
(WebCore::TileGrid::revalidateTiles):
prepopulateRect takes rects in "content" coordinates, but when later passed to
ensureTilesForRect, they're expected to be in the same coordinate space as the layer's
visible rect, and are scaled up. So, apply the inverse scale to counter that.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacTileGridmm">trunk/Source/WebCore/platform/graphics/ca/mac/TileGrid.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169563 => 169564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-03 18:12:44 UTC (rev 169563)
+++ trunk/Source/WebCore/ChangeLog 2014-06-03 18:13:28 UTC (rev 169564)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-06-03 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ TileGrid::prepopulateRect populates the wrong tiles if scale != 1
+ https://bugs.webkit.org/show_bug.cgi?id=133470
+
+ Reviewed by Simon Fraser.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::requestScrollPositionUpdate):
+ * platform/graphics/ca/mac/TileGrid.mm:
+ (WebCore::TileGrid::prepopulateRect):
+ (WebCore::TileGrid::revalidateTiles):
+ prepopulateRect takes rects in "content" coordinates, but when later passed to
+ ensureTilesForRect, they're expected to be in the same coordinate space as the layer's
+ visible rect, and are scaled up. So, apply the inverse scale to counter that.
+
+2014-06-03 Timothy Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Minor TileCoverageMap refinements
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133468
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (169563 => 169564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-06-03 18:12:44 UTC (rev 169563)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-06-03 18:13:28 UTC (rev 169564)
</span><span class="lines">@@ -2129,11 +2129,8 @@
</span><span class="cx"> bool FrameView::requestScrollPositionUpdate(const IntPoint& position)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><del>- if (TiledBacking* tiledBacking = this->tiledBacking()) {
- IntRect visibleRect = visibleContentRect();
- visibleRect.setLocation(position);
- tiledBacking->prepopulateRect(visibleRect);
- }
</del><ins>+ if (TiledBacking* tiledBacking = this->tiledBacking())
+ tiledBacking->prepopulateRect(FloatRect(position, visibleContentRect().size()));
</ins><span class="cx">
</span><span class="cx"> if (Page* page = frame().page()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacTileGridmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileGrid.mm (169563 => 169564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/TileGrid.mm 2014-06-03 18:12:44 UTC (rev 169563)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileGrid.mm 2014-06-03 18:13:28 UTC (rev 169564)
</span><span class="lines">@@ -202,14 +202,11 @@
</span><span class="cx">
</span><span class="cx"> bool TileGrid::prepopulateRect(const FloatRect& rect)
</span><span class="cx"> {
</span><del>- FloatRect scaledRect(rect);
- scaledRect.scale(m_scale);
- IntRect rectInTileCoords(enclosingIntRect(scaledRect));
</del><ins>+ IntRect enclosingCoverageRect = enclosingIntRect(rect);
+ if (m_primaryTileCoverageRect.contains(enclosingCoverageRect))
+ return false;
</ins><span class="cx">
</span><del>- if (m_primaryTileCoverageRect.contains(rectInTileCoords))
- return false;
-
- m_secondaryTileCoverageRects.append(rect);
</del><ins>+ m_secondaryTileCoverageRects.append(enclosingCoverageRect);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -360,8 +357,11 @@
</span><span class="cx"> removeAllSecondaryTiles();
</span><span class="cx"> m_cohortList.clear();
</span><span class="cx"> } else {
</span><del>- for (size_t i = 0; i < m_secondaryTileCoverageRects.size(); ++i)
- ensureTilesForRect(m_secondaryTileCoverageRects[i], CoverageType::SecondaryTiles);
</del><ins>+ for (auto& secondaryCoverageRect : m_secondaryTileCoverageRects) {
+ FloatRect secondaryRectInLayerCoordinates(secondaryCoverageRect);
+ secondaryRectInLayerCoordinates.scale(1 / m_scale);
+ ensureTilesForRect(secondaryRectInLayerCoordinates, CoverageType::SecondaryTiles);
+ }
</ins><span class="cx"> m_secondaryTileCoverageRects.clear();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>