<!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>[165581] 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/165581">165581</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-13 18:05:29 -0700 (Thu, 13 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/165540">r165540</a>.
https://bugs.webkit.org/show_bug.cgi?id=130199
caused 1 hidpi test fail (Requested by zalan on #webkit).
Reverted changeset:
"Subpixel rendering: Nested layers with subpixel accumulation
paint to wrong position."
https://bugs.webkit.org/show_bug.cgi?id=130153
http://trac.webkit.org/changeset/165540
Source/WebCore:
Patch by Commit Queue <commit-queue@webkit.org> on 2014-03-13
LayoutTests:
Patch by Commit Queue <commit-queue@webkit.org> on 2014-03-13</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="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingh">trunk/Source/WebCore/rendering/RenderLayerBacking.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositinghidpinestedcompositinglayerswithsubpixelaccumulationexpectedhtml">trunk/LayoutTests/compositing/hidpi-nested-compositing-layers-with-subpixel-accumulation-expected.html</a></li>
<li><a href="#trunkLayoutTestscompositinghidpinestedcompositinglayerswithsubpixelaccumulationhtml">trunk/LayoutTests/compositing/hidpi-nested-compositing-layers-with-subpixel-accumulation.html</a></li>
<li><a href="#trunkLayoutTestsfastlayershidpinestedlayerswithsubpixelaccumulationexpectedhtml">trunk/LayoutTests/fast/layers/hidpi-nested-layers-with-subpixel-accumulation-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastlayershidpinestedlayerswithsubpixelaccumulationhtml">trunk/LayoutTests/fast/layers/hidpi-nested-layers-with-subpixel-accumulation.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165580 => 165581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-14 00:40:30 UTC (rev 165580)
+++ trunk/LayoutTests/ChangeLog 2014-03-14 01:05:29 UTC (rev 165581)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-13 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r165540.
+ https://bugs.webkit.org/show_bug.cgi?id=130199
+
+ caused 1 hidpi test fail (Requested by zalan on #webkit).
+
+ Reverted changeset:
+
+ "Subpixel rendering: Nested layers with subpixel accumulation
+ paint to wrong position."
+ https://bugs.webkit.org/show_bug.cgi?id=130153
+ http://trac.webkit.org/changeset/165540
+
</ins><span class="cx"> 2014-03-13 Andres Gomez <agomez@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r165536.
</span></span></pre></div>
<a id="trunkLayoutTestscompositinghidpinestedcompositinglayerswithsubpixelaccumulationexpectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/compositing/hidpi-nested-compositing-layers-with-subpixel-accumulation-expected.html (165580 => 165581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/hidpi-nested-compositing-layers-with-subpixel-accumulation-expected.html 2014-03-14 00:40:30 UTC (rev 165580)
+++ trunk/LayoutTests/compositing/hidpi-nested-compositing-layers-with-subpixel-accumulation-expected.html 2014-03-14 01:05:29 UTC (rev 165581)
</span><span class="lines">@@ -1,32 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<title>This tests that nested compositing layers with subpixel accumulation paint to the same position as regular, non-compositing content.</title>
-<style>
- div {
- width: 5px;
- height: 2px;
- left: 0px;
- position: absolute;
- }
-</style>
-</head>
-<body>
-<p id="container"></p>
-<script>
- left = 0;
- for (i = 0; i < 10; ++i, left+=6.3) {
- var container = document.getElementById("container");
- for (j = 0; j < 50; ++j) {
- var e = document.createElement("div");
- e.style.top = "1.3px";
- if (j == 0)
- e.style.left = left + "px";
- e.style.backgroundColor = "rgb(0, 0, " + (j * 4) + ")";
- container.appendChild(e);
- container = e;
- }
- }
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestscompositinghidpinestedcompositinglayerswithsubpixelaccumulationhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/compositing/hidpi-nested-compositing-layers-with-subpixel-accumulation.html (165580 => 165581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/hidpi-nested-compositing-layers-with-subpixel-accumulation.html 2014-03-14 00:40:30 UTC (rev 165580)
+++ trunk/LayoutTests/compositing/hidpi-nested-compositing-layers-with-subpixel-accumulation.html 2014-03-14 01:05:29 UTC (rev 165581)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<title>This tests that nested compositing layers with subpixel accumulation paint to the same position as regular, non-compositing content.</title>
-<style>
- div {
- width: 5px;
- height: 2px;
- left: 0px;
- position: absolute;
- -webkit-transform: translateZ(0);
- }
-</style>
-</head>
-<body>
-<p id="container"></p>
-<script>
- left = 0;
- for (i = 0; i < 10; ++i, left+=6.3) {
- var container = document.getElementById("container");
- for (j = 0; j < 50; ++j) {
- var e = document.createElement("div");
- e.style.top = "1.3px";
- if (j == 0)
- e.style.left = left + "px";
- e.style.backgroundColor = "rgb(0, 0, " + (j * 4) + ")";
- container.appendChild(e);
- container = e;
- }
- }
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastlayershidpinestedlayerswithsubpixelaccumulationexpectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/layers/hidpi-nested-layers-with-subpixel-accumulation-expected.html (165580 => 165581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/layers/hidpi-nested-layers-with-subpixel-accumulation-expected.html 2014-03-14 00:40:30 UTC (rev 165580)
+++ trunk/LayoutTests/fast/layers/hidpi-nested-layers-with-subpixel-accumulation-expected.html 2014-03-14 01:05:29 UTC (rev 165581)
</span><span class="lines">@@ -1,32 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<title>This tests that nested non-compositing layers with subpixel accumulation paint to the same position as regular content.</title>
-<style>
- div {
- width: 5px;
- height: 2px;
- left: 0px;
- position: absolute;
- }
-</style>
-</head>
-<body>
-<p id="container"></p>
-<script>
- left = 0;
- for (i = 0; i < 10; ++i, left+=6.3) {
- var container = document.getElementById("container");
- for (j = 0; j < 50; ++j) {
- var e = document.createElement("div");
- e.style.top = "1.3px";
- if (j == 0)
- e.style.left = left + "px";
- e.style.backgroundColor = "rgb(0, 0, " + (j * 4) + ")";
- container.appendChild(e);
- container = e;
- }
- }
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastlayershidpinestedlayerswithsubpixelaccumulationhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/layers/hidpi-nested-layers-with-subpixel-accumulation.html (165580 => 165581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/layers/hidpi-nested-layers-with-subpixel-accumulation.html 2014-03-14 00:40:30 UTC (rev 165580)
+++ trunk/LayoutTests/fast/layers/hidpi-nested-layers-with-subpixel-accumulation.html 2014-03-14 01:05:29 UTC (rev 165581)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<title>This tests that nested non-compositing layers with subpixel accumulation paint to the same position as regular content.</title>
-<style>
- div {
- width: 5px;
- height: 2px;
- left: 0px;
- position: absolute;
- -webkit-transform: rotate(0deg);
- }
-</style>
-</head>
-<body>
-<p id="container"></p>
-<script>
- left = 0;
- for (i = 0; i < 10; ++i, left+=6.3) {
- var container = document.getElementById("container");
- for (j = 0; j < 50; ++j) {
- var e = document.createElement("div");
- e.style.top = "1.3px";
- if (j == 0)
- e.style.left = left + "px";
- e.style.backgroundColor = "rgb(0, 0, " + (j * 4) + ")";
- container.appendChild(e);
- container = e;
- }
- }
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165580 => 165581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-14 00:40:30 UTC (rev 165580)
+++ trunk/Source/WebCore/ChangeLog 2014-03-14 01:05:29 UTC (rev 165581)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-13 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r165540.
+ https://bugs.webkit.org/show_bug.cgi?id=130199
+
+ caused 1 hidpi test fail (Requested by zalan on #webkit).
+
+ Reverted changeset:
+
+ "Subpixel rendering: Nested layers with subpixel accumulation
+ paint to wrong position."
+ https://bugs.webkit.org/show_bug.cgi?id=130153
+ http://trac.webkit.org/changeset/165540
+
</ins><span class="cx"> 2014-03-13 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix a bunch of mistakes in the parsing of ::cue( and ::cue
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (165580 => 165581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-03-14 00:40:30 UTC (rev 165580)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-03-14 01:05:29 UTC (rev 165581)
</span><span class="lines">@@ -4167,15 +4167,14 @@
</span><span class="cx"> // This involves subtracting out the position of the layer in our current coordinate space, but preserving
</span><span class="cx"> // the accumulated error for sub-pixel layout.
</span><span class="cx"> float deviceScaleFactor = renderer().document().deviceScaleFactor();
</span><del>- LayoutPoint offsetFromParent;
- convertToLayerCoords(paintingInfo.rootLayer, offsetFromParent);
- offsetFromParent.moveBy(translationOffset);
</del><ins>+ LayoutPoint delta;
+ convertToLayerCoords(paintingInfo.rootLayer, delta);
+ delta.moveBy(translationOffset);
</ins><span class="cx"> TransformationMatrix transform(renderableTransform(paintingInfo.paintBehavior));
</span><del>- FloatPoint devicePixelFlooredOffsetFromParent = flooredForPainting(offsetFromParent, deviceScaleFactor);
- transform.translateRight(devicePixelFlooredOffsetFromParent.x(), devicePixelFlooredOffsetFromParent.y());
- // We handle accumulated subpixels through nested layers here. Since the context gets translated with floored device pixel value,
- // all we need to do is add the difference to the accumulated pixels coming from ancestor layers.
- LayoutSize adjustedSubPixelAccumulation = paintingInfo.subPixelAccumulation + (offsetFromParent - LayoutPoint(devicePixelFlooredOffsetFromParent));
</del><ins>+ FloatPoint roundedDelta = roundedForPainting(delta, deviceScaleFactor);
+ transform.translateRight(roundedDelta.x(), roundedDelta.y());
+ LayoutSize adjustedSubPixelAccumulation = paintingInfo.subPixelAccumulation + (delta - LayoutPoint(roundedDelta));
+
</ins><span class="cx"> // Apply the transform.
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*context);
</span><span class="cx"> context->concatCTM(transform.toAffineTransform());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (165580 => 165581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-14 00:40:30 UTC (rev 165580)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-14 01:05:29 UTC (rev 165581)
</span><span class="lines">@@ -739,8 +739,6 @@
</span><span class="cx">
</span><span class="cx"> LayoutPoint offsetFromParent;
</span><span class="cx"> m_owningLayer.convertToLayerCoords(compAncestor, offsetFromParent, RenderLayer::AdjustForColumns);
</span><del>- // Device pixel fractions get accumulated through ancestor layers. Our painting offset is layout offset + parent's painting offset.
- offsetFromParent = offsetFromParent + (compAncestor ? compAncestor->backing()->devicePixelFractionFromRenderer() : LayoutSize());
</del><span class="cx"> relativeCompositingBounds.moveBy(offsetFromParent);
</span><span class="cx">
</span><span class="cx"> LayoutRect enclosingRelativeCompositingBounds = LayoutRect(enclosingRectForPainting(relativeCompositingBounds, deviceScaleFactor));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (165580 => 165581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-03-14 00:40:30 UTC (rev 165580)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-03-14 01:05:29 UTC (rev 165581)
</span><span class="lines">@@ -213,8 +213,6 @@
</span><span class="cx"> void setBlendMode(BlendMode);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- LayoutSize devicePixelFractionFromRenderer() const { return m_devicePixelFractionFromRenderer; }
-
</del><span class="cx"> private:
</span><span class="cx"> FloatRect backgroundBoxForPainting() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>