<!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>[185036] 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/185036">185036</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-05-30 19:25:56 -0700 (Sat, 30 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Tiling coverage sometimes inflated by outdated scale factor.
<https://webkit.org/b/145494>
<rdar://problem/20989389>
Reviewed by Benjamin Poulain.
Have GraphicsLayerCA plumb the current contents scale through to TileController::adjustCoverageRect()
instead of TileController getting it from TileGrid.
This avoids a situation where adjustCoverageRect() could cause temporarily oversized tiling coverage
if called while TileGrid's content scale is outdated, and we're neither zooming or pinching, following
a pinch zoom that increased the scale factor.
Specifically, if all the velocity data is zero, we pad the coverage rect by a horizontal and vertical
margin computed like so:
margin = defaultTileSize / tileGrid.scale
If the actual scale is 5, but the TileGrid's outdated scale is e.g 0.8, you'll get a much larger
margin than you really wanted. Then the whole thing gets scaled up by 5x later on, and we explode
in a fiery feast of IOSurface allocations.
* platform/graphics/TiledBacking.h:
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::adjustCoverageRect):
* platform/graphics/ca/TileController.cpp:
(WebCore::TileController::computeTileCoverageRect):
* platform/graphics/ca/TileController.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTiledBackingh">trunk/Source/WebCore/platform/graphics/TiledBacking.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllercpp">trunk/Source/WebCore/platform/graphics/ca/TileController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllerh">trunk/Source/WebCore/platform/graphics/ca/TileController.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185035 => 185036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-31 01:08:42 UTC (rev 185035)
+++ trunk/Source/WebCore/ChangeLog 2015-05-31 02:25:56 UTC (rev 185036)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-05-30 Andreas Kling <akling@apple.com>
+
+ [iOS] Tiling coverage sometimes inflated by outdated scale factor.
+ <https://webkit.org/b/145494>
+ <rdar://problem/20989389>
+
+ Reviewed by Benjamin Poulain.
+
+ Have GraphicsLayerCA plumb the current contents scale through to TileController::adjustCoverageRect()
+ instead of TileController getting it from TileGrid.
+
+ This avoids a situation where adjustCoverageRect() could cause temporarily oversized tiling coverage
+ if called while TileGrid's content scale is outdated, and we're neither zooming or pinching, following
+ a pinch zoom that increased the scale factor.
+
+ Specifically, if all the velocity data is zero, we pad the coverage rect by a horizontal and vertical
+ margin computed like so:
+
+ margin = defaultTileSize / tileGrid.scale
+
+ If the actual scale is 5, but the TileGrid's outdated scale is e.g 0.8, you'll get a much larger
+ margin than you really wanted. Then the whole thing gets scaled up by 5x later on, and we explode
+ in a fiery feast of IOSurface allocations.
+
+ * platform/graphics/TiledBacking.h:
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::adjustCoverageRect):
+ * platform/graphics/ca/TileController.cpp:
+ (WebCore::TileController::computeTileCoverageRect):
+ * platform/graphics/ca/TileController.h:
+
</ins><span class="cx"> 2015-05-30 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix Windows tests broken by r185007.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTiledBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TiledBacking.h (185035 => 185036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TiledBacking.h 2015-05-31 01:08:42 UTC (rev 185035)
+++ trunk/Source/WebCore/platform/graphics/TiledBacking.h 2015-05-31 02:25:56 UTC (rev 185036)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> virtual void setTileCoverage(TileCoverage) = 0;
</span><span class="cx"> virtual TileCoverage tileCoverage() const = 0;
</span><span class="cx">
</span><del>- virtual FloatRect computeTileCoverageRect(const FloatSize& newSize, const FloatRect& previousVisibleRect, const FloatRect& currentVisibleRect) const = 0;
</del><ins>+ virtual FloatRect computeTileCoverageRect(const FloatSize& newSize, const FloatRect& previousVisibleRect, const FloatRect& currentVisibleRect, float contentsScale) const = 0;
</ins><span class="cx">
</span><span class="cx"> virtual IntSize tileSize() const = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (185035 => 185036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-05-31 01:08:42 UTC (rev 185035)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-05-31 02:25:56 UTC (rev 185036)
</span><span class="lines">@@ -1246,7 +1246,7 @@
</span><span class="cx"> // ways of computing coverage.
</span><span class="cx"> switch (type()) {
</span><span class="cx"> case Type::PageTiledBacking:
</span><del>- coverageRect = tiledBacking()->computeTileCoverageRect(size(), oldVisibleRect, rects.visibleRect);
</del><ins>+ coverageRect = tiledBacking()->computeTileCoverageRect(size(), oldVisibleRect, rects.visibleRect, pageScaleFactor() * deviceScaleFactor());
</ins><span class="cx"> break;
</span><span class="cx"> case Type::Normal:
</span><span class="cx"> if (m_layer->layerType() == PlatformCALayer::LayerTypeTiledBackingLayer)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.cpp (185035 => 185036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2015-05-31 01:08:42 UTC (rev 185035)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2015-05-31 02:25:56 UTC (rev 185036)
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> return boundsWithoutMargin;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FloatRect TileController::computeTileCoverageRect(const FloatSize& newSize, const FloatRect& previousVisibleRect, const FloatRect& visibleRect) const
</del><ins>+FloatRect TileController::computeTileCoverageRect(const FloatSize& newSize, const FloatRect& previousVisibleRect, const FloatRect& visibleRect, float contentsScale) const
</ins><span class="cx"> {
</span><span class="cx"> // If the page is not in a window (for example if it's in a background tab), we limit the tile coverage rect to the visible rect.
</span><span class="cx"> if (!m_isInWindow)
</span><span class="lines">@@ -326,12 +326,12 @@
</span><span class="cx"> if (m_tileCoverage == CoverageForVisibleArea || MemoryPressureHandler::singleton().isUnderMemoryPressure())
</span><span class="cx"> return visibleRect;
</span><span class="cx">
</span><del>- double horizontalMargin = defaultTileWidth / tileGrid().scale();
- double verticalMargin = defaultTileHeight / tileGrid().scale();
</del><ins>+ double horizontalMargin = defaultTileWidth / contentsScale;
+ double verticalMargin = defaultTileHeight / contentsScale;
</ins><span class="cx">
</span><span class="cx"> double currentTime = monotonicallyIncreasingTime();
</span><span class="cx"> double timeDelta = currentTime - m_velocity.lastUpdateTime;
</span><del>-
</del><ins>+
</ins><span class="cx"> FloatRect futureRect = visibleRect;
</span><span class="cx"> futureRect.setLocation(FloatPoint(
</span><span class="cx"> futureRect.location().x() + timeDelta * m_velocity.horizontalVelocity,
</span><span class="lines">@@ -372,6 +372,8 @@
</span><span class="cx">
</span><span class="cx"> return futureRect;
</span><span class="cx"> #else
</span><ins>+ UNUSED_PARAM(contentsScale);
+
</ins><span class="cx"> // FIXME: look at how far the document can scroll in each dimension.
</span><span class="cx"> float coverageHorizontalSize = visibleRect.width();
</span><span class="cx"> float coverageVerticalSize = visibleRect.height();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.h (185035 => 185036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.h 2015-05-31 01:08:42 UTC (rev 185035)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.h 2015-05-31 02:25:56 UTC (rev 185036)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> virtual int leftMarginWidth() const override;
</span><span class="cx"> virtual int rightMarginWidth() const override;
</span><span class="cx"> virtual TileCoverage tileCoverage() const override { return m_tileCoverage; }
</span><del>- virtual FloatRect computeTileCoverageRect(const FloatSize& newSize, const FloatRect& previousVisibleRect, const FloatRect& currentVisibleRect) const override;
</del><ins>+ virtual FloatRect computeTileCoverageRect(const FloatSize& newSize, const FloatRect& previousVisibleRect, const FloatRect& currentVisibleRect, float contentsScale) const override;
</ins><span class="cx"> virtual bool unparentsOffscreenTiles() const override { return m_unparentsOffscreenTiles; }
</span><span class="cx"> virtual bool scrollingPerformanceLoggingEnabled() const override { return m_scrollingPerformanceLoggingEnabled; }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>