<!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>[169512] 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/169512">169512</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-05-31 23:26:45 -0700 (Sat, 31 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/169412">r169412</a>): Garbage pixels when vertical rubber-banding on http://yvoschaap.com/pmarca/
https://bugs.webkit.org/show_bug.cgi?id=133418
<rdar://problem/17065494>
Reviewed by Sam Weinig.
* WebCore.exp.in:
* platform/graphics/FloatPoint.h:
(WebCore::toFloatPoint):
* platform/graphics/Image.cpp:
(WebCore::Image::drawTiled):
The manual tiling code previously adjusted the initial
tiling source rect so that if the pattern was out of phase,
the first row and column would paint only the necessary part
of the tile. However, it did not also adjust the destination rect,
so the tile was painted in entirely the wrong place.
Additional testing (by enabling manual tiling mode for all patterned
images and running all of the layout tests) exposed another bug
where the last row and column would paint too much, which
was resolved by clipping to the outer image's destination rect.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatPointh">trunk/Source/WebCore/platform/graphics/FloatPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImagecpp">trunk/Source/WebCore/platform/graphics/Image.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169511 => 169512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-01 06:26:39 UTC (rev 169511)
+++ trunk/Source/WebCore/ChangeLog 2014-06-01 06:26:45 UTC (rev 169512)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-05-31 Timothy Horton <timothy_horton@apple.com>
+
+ REGRESSION (r169412): Garbage pixels when vertical rubber-banding on http://yvoschaap.com/pmarca/
+ https://bugs.webkit.org/show_bug.cgi?id=133418
+ <rdar://problem/17065494>
+
+ Reviewed by Sam Weinig.
+
+ * WebCore.exp.in:
+ * platform/graphics/FloatPoint.h:
+ (WebCore::toFloatPoint):
+ * platform/graphics/Image.cpp:
+ (WebCore::Image::drawTiled):
+ The manual tiling code previously adjusted the initial
+ tiling source rect so that if the pattern was out of phase,
+ the first row and column would paint only the necessary part
+ of the tile. However, it did not also adjust the destination rect,
+ so the tile was painted in entirely the wrong place.
+ Additional testing (by enabling manual tiling mode for all patterned
+ images and running all of the layout tests) exposed another bug
+ where the last row and column would paint too much, which
+ was resolved by clipping to the outer image's destination rect.
+
</ins><span class="cx"> 2014-05-31 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> CSS JIT cleanup: move two utility functions out of the properties-matcher section
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatPoint.h (169511 => 169512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatPoint.h 2014-06-01 06:26:39 UTC (rev 169511)
+++ trunk/Source/WebCore/platform/graphics/FloatPoint.h 2014-06-01 06:26:45 UTC (rev 169512)
</span><span class="lines">@@ -235,6 +235,11 @@
</span><span class="cx"> return FloatSize(a.x(), a.y());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline FloatPoint toFloatPoint(const FloatSize& a)
+{
+ return FloatPoint(a.width(), a.height());
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Image.cpp (169511 => 169512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Image.cpp 2014-06-01 06:26:39 UTC (rev 169511)
+++ trunk/Source/WebCore/platform/graphics/Image.cpp 2014-06-01 06:26:45 UTC (rev 169512)
</span><span class="lines">@@ -153,7 +153,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-
</del><span class="cx"> // Patterned images and gradients can use lots of memory for caching when the
</span><span class="cx"> // tile size is large (<rdar://problem/4691859>, <rdar://problem/6239505>).
</span><span class="cx"> // Memory consumption depends on the transformed tile size which can get
</span><span class="lines">@@ -165,21 +164,27 @@
</span><span class="cx"> #endif
</span><span class="cx"> FloatRect transformedTileSize = ctxt->getCTM().mapRect(FloatRect(FloatPoint(), scaledTileSize));
</span><span class="cx"> float transformedTileSizePixels = transformedTileSize.width() * transformedTileSize.height();
</span><ins>+ FloatRect currentTileRect = oneTileRect;
</ins><span class="cx"> if (transformedTileSizePixels > maxPatternTilePixels) {
</span><del>- float fromY = (destRect.y() - oneTileRect.y()) / scale.height();
- float toY = oneTileRect.y();
</del><ins>+ GraphicsContextStateSaver stateSaver(*ctxt);
+ ctxt->clip(destRect);
+
+ currentTileRect.shiftYEdgeTo(destRect.y());
+ float toY = currentTileRect.y();
</ins><span class="cx"> while (toY < destRect.maxY()) {
</span><del>- float fromX = (destRect.x() - oneTileRect.x()) / scale.width();
- float toX = oneTileRect.x();
</del><ins>+ currentTileRect.shiftXEdgeTo(destRect.x());
+ float toX = currentTileRect.x();
</ins><span class="cx"> while (toX < destRect.maxX()) {
</span><del>- FloatRect toRect(toX, toY, oneTileRect.width(), oneTileRect.height());
- FloatRect fromRect(fromX, fromY, oneTileRect.width() / scale.width(), oneTileRect.height() / scale.height());
</del><ins>+ FloatRect toRect(toX, toY, currentTileRect.width(), currentTileRect.height());
+ FloatRect fromRect(toFloatPoint(currentTileRect.location() - oneTileRect.location()), currentTileRect.size());
+ fromRect.scale(1 / scale.width(), 1 / scale.height());
+
</ins><span class="cx"> draw(ctxt, toRect, fromRect, styleColorSpace, op, BlendModeNormal, ImageOrientationDescription());
</span><del>- toX += oneTileRect.width();
- fromX = 0;
</del><ins>+ toX += currentTileRect.width();
+ currentTileRect.shiftXEdgeTo(oneTileRect.x());
</ins><span class="cx"> }
</span><del>- toY += oneTileRect.height();
- fromY = 0;
</del><ins>+ toY += currentTileRect.height();
+ currentTileRect.shiftYEdgeTo(oneTileRect.y());
</ins><span class="cx"> }
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>