<!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>[165892] 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/165892">165892</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-03-19 07:25:34 -0700 (Wed, 19 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel rendering: Transform origin is miscalculated when RenderLayer's
offsetfromRenderer has device pixel fraction value.
https://bugs.webkit.org/show_bug.cgi?id=129859
Reviewed by Simon Fraser.
We need to calculate the transformed origin using the painting coordinates to produce
pixel precise result.
Source/WebCore:
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
(WebCore::RenderLayerBacking::computeTransformOriginForPainting):
* rendering/RenderLayerBacking.h:
LayoutTests:
* compositing/columns/composited-columns-expected.txt:
* compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt:
* compositing/repaint/resize-repaint-expected.txt:
* platform/mac/compositing/repaint/invalidations-on-composited-layers-expected.txt:
* platform/mac/compositing/visibility/visibility-image-layers-dynamic-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscompositingcolumnscompositedcolumnsexpectedtxt">trunk/LayoutTests/compositing/columns/composited-columns-expected.txt</a></li>
<li><a href="#trunkLayoutTestscompositinggeometrylimitlayerboundsopacitytransitionexpectedtxt">trunk/LayoutTests/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt</a></li>
<li><a href="#trunkLayoutTestscompositingrepaintresizerepaintexpectedtxt">trunk/LayoutTests/compositing/repaint/resize-repaint-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccompositingrepaintinvalidationsoncompositedlayersexpectedtxt">trunk/LayoutTests/platform/mac/compositing/repaint/invalidations-on-composited-layers-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccompositingvisibilityvisibilityimagelayersdynamicexpectedtxt">trunk/LayoutTests/platform/mac/compositing/visibility/visibility-image-layers-dynamic-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositinghidpitransformwithrenderlayeronfractionalpixelvalueexpectedhtml">trunk/LayoutTests/compositing/hidpi-transform-with-render-layer-on-fractional-pixel-value-expected.html</a></li>
<li><a href="#trunkLayoutTestscompositinghidpitransformwithrenderlayeronfractionalpixelvaluehtml">trunk/LayoutTests/compositing/hidpi-transform-with-render-layer-on-fractional-pixel-value.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165891 => 165892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-19 13:49:41 UTC (rev 165891)
+++ trunk/LayoutTests/ChangeLog 2014-03-19 14:25:34 UTC (rev 165892)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-03-19 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Transform origin is miscalculated when RenderLayer's
+ offsetfromRenderer has device pixel fraction value.
+ https://bugs.webkit.org/show_bug.cgi?id=129859
+
+ Reviewed by Simon Fraser.
+
+ We need to calculate the transformed origin using the painting coordinates to produce
+ pixel precise result.
+
+ * compositing/columns/composited-columns-expected.txt:
+ * compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt:
+ * compositing/repaint/resize-repaint-expected.txt:
+ * platform/mac/compositing/repaint/invalidations-on-composited-layers-expected.txt:
+ * platform/mac/compositing/visibility/visibility-image-layers-dynamic-expected.txt:
+
</ins><span class="cx"> 2014-03-19 Mihnea Ovidenie <mihnea@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSSRegions] Compute region ranges for children of inline blocks
</span></span></pre></div>
<a id="trunkLayoutTestscompositingcolumnscompositedcolumnsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/compositing/columns/composited-columns-expected.txt (165891 => 165892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/columns/composited-columns-expected.txt 2014-03-19 13:49:41 UTC (rev 165891)
+++ trunk/LayoutTests/compositing/columns/composited-columns-expected.txt 2014-03-19 14:25:34 UTC (rev 165892)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 8.00 8.00)
</span><ins>+ (anchor 0.50 0.50)
</ins><span class="cx"> (bounds 769.00 840.00)
</span><span class="cx"> (drawsContent 1)
</span><span class="cx"> (children 1
</span></span></pre></div>
<a id="trunkLayoutTestscompositinggeometrylimitlayerboundsopacitytransitionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt (165891 => 165892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt 2014-03-19 13:49:41 UTC (rev 165891)
+++ trunk/LayoutTests/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt 2014-03-19 14:25:34 UTC (rev 165892)
</span><span class="lines">@@ -9,6 +9,7 @@
</span><span class="cx"> (children 2
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 8.00 8.00)
</span><ins>+ (anchor 1.00 1.00)
</ins><span class="cx"> (bounds 1.00 1.00)
</span><span class="cx"> )
</span><span class="cx"> (GraphicsLayer
</span></span></pre></div>
<a id="trunkLayoutTestscompositinghidpitransformwithrenderlayeronfractionalpixelvalueexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/hidpi-transform-with-render-layer-on-fractional-pixel-value-expected.html (0 => 165892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/hidpi-transform-with-render-layer-on-fractional-pixel-value-expected.html (rev 0)
+++ trunk/LayoutTests/compositing/hidpi-transform-with-render-layer-on-fractional-pixel-value-expected.html 2014-03-19 14:25:34 UTC (rev 165892)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that transform anchor point is calculated properly when renderer() has fractional device pixel value.</title>
+<head>
+<style>
+ div {
+ background: green;
+ width: 9px;
+ height: 9px;
+ position: absolute;
+ }
+</style>
+</head>
+<body>
+<p id="container"></p>
+<script>
+ var container = document.getElementById("container");
+ adjustment = 0.1;
+ for (i = 0; i < 10; ++i) {
+ adjustment+=0.1;
+ for (j = 0; j < 10; ++j) {
+ var e = document.createElement("div");
+ e.style.top = (11 * i + j * adjustment) + "px";
+ e.style.left = (11 * j + i * adjustment) + "px";
+ container.appendChild(e);
+ }
+ }
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscompositinghidpitransformwithrenderlayeronfractionalpixelvaluehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/hidpi-transform-with-render-layer-on-fractional-pixel-value.html (0 => 165892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/hidpi-transform-with-render-layer-on-fractional-pixel-value.html (rev 0)
+++ trunk/LayoutTests/compositing/hidpi-transform-with-render-layer-on-fractional-pixel-value.html 2014-03-19 14:25:34 UTC (rev 165892)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that transform anchor point is calculated properly when renderer() has fractional device pixel value.</title>
+<head>
+<style>
+ div {
+ background: green;
+ width: 9px;
+ height: 9px;
+ position: absolute;
+ -webkit-transform: rotate3D(0, 0, 1, 90deg)
+ }
+</style>
+</head>
+<body>
+<p id="container"></p>
+<script>
+ var container = document.getElementById("container");
+ adjustment = 0.1;
+ for (i = 0; i < 10; ++i) {
+ adjustment+=0.1;
+ for (j = 0; j < 10; ++j) {
+ var e = document.createElement("div");
+ e.style.top = (11 * i + j * adjustment) + "px";
+ e.style.left = (11 * j + i * adjustment) + "px";
+ container.appendChild(e);
+ }
+ }
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscompositingrepaintresizerepaintexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/compositing/repaint/resize-repaint-expected.txt (165891 => 165892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/repaint/resize-repaint-expected.txt 2014-03-19 13:49:41 UTC (rev 165891)
+++ trunk/LayoutTests/compositing/repaint/resize-repaint-expected.txt 2014-03-19 14:25:34 UTC (rev 165892)
</span><span class="lines">@@ -11,6 +11,7 @@
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 8.00 8.00)
</span><ins>+ (anchor 0.50 0.50)
</ins><span class="cx"> (bounds 402.00 207.00)
</span><span class="cx"> (drawsContent 1)
</span><span class="cx"> (repaint rects
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccompositingrepaintinvalidationsoncompositedlayersexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/compositing/repaint/invalidations-on-composited-layers-expected.txt (165891 => 165892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/compositing/repaint/invalidations-on-composited-layers-expected.txt 2014-03-19 13:49:41 UTC (rev 165891)
+++ trunk/LayoutTests/platform/mac/compositing/repaint/invalidations-on-composited-layers-expected.txt 2014-03-19 14:25:34 UTC (rev 165892)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 50.00 50.00)
</span><ins>+ (anchor 0.51 0.51)
</ins><span class="cx"> (bounds 75.00 75.00)
</span><span class="cx"> (contentsOpaque 1)
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccompositingvisibilityvisibilityimagelayersdynamicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/compositing/visibility/visibility-image-layers-dynamic-expected.txt (165891 => 165892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/compositing/visibility/visibility-image-layers-dynamic-expected.txt 2014-03-19 13:49:41 UTC (rev 165891)
+++ trunk/LayoutTests/platform/mac/compositing/visibility/visibility-image-layers-dynamic-expected.txt 2014-03-19 14:25:34 UTC (rev 165892)
</span><span class="lines">@@ -12,6 +12,7 @@
</span><span class="cx"> (children 3
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 14.00 6.00)
</span><ins>+ (anchor 0.50 0.50)
</ins><span class="cx"> (bounds 757.00 152.00)
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="lines">@@ -23,6 +24,7 @@
</span><span class="cx"> )
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 14.00 160.00)
</span><ins>+ (anchor 0.50 0.50)
</ins><span class="cx"> (bounds 757.00 152.00)
</span><span class="cx"> (contentsVisible 0)
</span><span class="cx"> (children 1
</span><span class="lines">@@ -35,6 +37,7 @@
</span><span class="cx"> )
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 14.00 314.00)
</span><ins>+ (anchor 0.50 0.50)
</ins><span class="cx"> (bounds 757.00 152.00)
</span><span class="cx"> (contentsVisible 0)
</span><span class="cx"> (children 1
</span><span class="lines">@@ -51,14 +54,15 @@
</span><span class="cx"> After step 1
</span><span class="cx">
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 785.00 1321.00)
</del><ins>+ (bounds 785.00 1366.00)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 785.00 1321.00)
</del><ins>+ (bounds 785.00 1366.00)
</ins><span class="cx"> (contentsOpaque 1)
</span><span class="cx"> (children 3
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 14.00 6.00)
</span><ins>+ (anchor 0.50 0.50)
</ins><span class="cx"> (bounds 757.00 152.00)
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="lines">@@ -69,6 +73,7 @@
</span><span class="cx"> )
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 14.00 160.00)
</span><ins>+ (anchor 0.50 0.50)
</ins><span class="cx"> (bounds 757.00 152.00)
</span><span class="cx"> (contentsVisible 0)
</span><span class="cx"> (children 1
</span><span class="lines">@@ -81,6 +86,7 @@
</span><span class="cx"> )
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 14.00 314.00)
</span><ins>+ (anchor 0.50 0.50)
</ins><span class="cx"> (bounds 757.00 152.00)
</span><span class="cx"> (contentsVisible 0)
</span><span class="cx"> (children 1
</span><span class="lines">@@ -97,14 +103,15 @@
</span><span class="cx"> After step 2
</span><span class="cx">
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 785.00 2000.00)
</del><ins>+ (bounds 785.00 2090.00)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 785.00 2000.00)
</del><ins>+ (bounds 785.00 2090.00)
</ins><span class="cx"> (contentsOpaque 1)
</span><span class="cx"> (children 3
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 14.00 6.00)
</span><ins>+ (anchor 0.50 0.50)
</ins><span class="cx"> (bounds 757.00 152.00)
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="lines">@@ -115,6 +122,7 @@
</span><span class="cx"> )
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 14.00 160.00)
</span><ins>+ (anchor 0.50 0.50)
</ins><span class="cx"> (bounds 757.00 152.00)
</span><span class="cx"> (drawsContent 1)
</span><span class="cx"> (children 1
</span><span class="lines">@@ -126,6 +134,7 @@
</span><span class="cx"> )
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 14.00 314.00)
</span><ins>+ (anchor 0.50 0.50)
</ins><span class="cx"> (bounds 757.00 152.00)
</span><span class="cx"> (contentsVisible 0)
</span><span class="cx"> (children 1
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165891 => 165892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-19 13:49:41 UTC (rev 165891)
+++ trunk/Source/WebCore/ChangeLog 2014-03-19 14:25:34 UTC (rev 165892)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-03-19 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Transform origin is miscalculated when RenderLayer's
+ offsetfromRenderer has device pixel fraction value.
+ https://bugs.webkit.org/show_bug.cgi?id=129859
+
+ Reviewed by Simon Fraser.
+
+ We need to calculate the transformed origin using the painting coordinates to produce
+ pixel precise result.
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
+ (WebCore::RenderLayerBacking::computeTransformOriginForPainting):
+ * rendering/RenderLayerBacking.h:
+
</ins><span class="cx"> 2014-03-19 Claudio Saavedra <csaavedra@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] Clean timeout source ids
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (165891 => 165892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-19 13:49:41 UTC (rev 165891)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-19 14:25:34 UTC (rev 165892)
</span><span class="lines">@@ -839,17 +839,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_owningLayer.hasTransform()) {
</span><del>- const LayoutRect borderBox = toRenderBox(renderer()).pixelSnappedBorderBoxRect();
-
</del><ins>+ // Update properties that depend on layer dimensions.
+ FloatPoint3D transformOrigin = computeTransformOriginForPainting(toRenderBox(renderer()).borderBoxRect());
</ins><span class="cx"> // Get layout bounds in the coords of compAncestor to match relativeCompositingBounds.
</span><del>- LayoutRect layerBounds(offsetFromParent, borderBox.size());
-
- // Update properties that depend on layer dimensions
- FloatPoint3D transformOrigin = computeTransformOrigin(borderBox);
</del><ins>+ FloatPoint layerOffset = roundedForPainting(offsetFromParent, deviceScaleFactor);
</ins><span class="cx"> // Compute the anchor point, which is in the center of the renderer box unless transform-origin is set.
</span><del>- FloatPoint3D anchor(enclosingRelativeCompositingBounds.width() != 0.0f ? ((layerBounds.x() - enclosingRelativeCompositingBounds.x()) + transformOrigin.x())
- / enclosingRelativeCompositingBounds.width() : 0.5f, enclosingRelativeCompositingBounds.height() != 0.0f ? ((layerBounds.y() - enclosingRelativeCompositingBounds.y())
- + transformOrigin.y()) / enclosingRelativeCompositingBounds.height() : 0.5f, transformOrigin.z());
</del><ins>+ FloatPoint3D anchor(enclosingRelativeCompositingBounds.width() ? ((layerOffset.x() - enclosingRelativeCompositingBounds.x()) + transformOrigin.x())
+ / enclosingRelativeCompositingBounds.width() : 0.5, enclosingRelativeCompositingBounds.height() ? ((layerOffset.y() - enclosingRelativeCompositingBounds.y())
+ + transformOrigin.y()) / enclosingRelativeCompositingBounds.height() : 0.5, transformOrigin.z());
+
</ins><span class="cx"> if (m_contentsContainmentLayer)
</span><span class="cx"> m_contentsContainmentLayer->setAnchorPoint(anchor);
</span><span class="cx"> else
</span><span class="lines">@@ -873,9 +871,9 @@
</span><span class="cx"> m_graphicsLayer->setChildrenTransform(TransformationMatrix());
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- m_graphicsLayer->setAnchorPoint(FloatPoint3D(0.5f, 0.5f, 0));
</del><ins>+ m_graphicsLayer->setAnchorPoint(FloatPoint3D(0.5, 0.5, 0));
</ins><span class="cx"> if (m_contentsContainmentLayer)
</span><del>- m_contentsContainmentLayer->setAnchorPoint(FloatPoint3D(0.5f, 0.5f, 0));
</del><ins>+ m_contentsContainmentLayer->setAnchorPoint(FloatPoint3D(0.5, 0.5, 0));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_foregroundLayer) {
</span><span class="lines">@@ -1916,32 +1914,19 @@
</span><span class="cx"> image->startAnimation();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FloatPoint3D RenderLayerBacking::computeTransformOrigin(const LayoutRect& borderBox) const
</del><ins>+FloatPoint3D RenderLayerBacking::computeTransformOriginForPainting(const LayoutRect& borderBox) const
</ins><span class="cx"> {
</span><span class="cx"> const RenderStyle& style = renderer().style();
</span><ins>+ float deviceScaleFactor = renderer().document().deviceScaleFactor();
</ins><span class="cx">
</span><span class="cx"> FloatPoint3D origin;
</span><del>- origin.setX(floatValueForLength(style.transformOriginX(), borderBox.width()));
- origin.setY(floatValueForLength(style.transformOriginY(), borderBox.height()));
</del><ins>+ origin.setX(roundToDevicePixel(floatValueForLength(style.transformOriginX(), borderBox.width()), deviceScaleFactor));
+ origin.setY(roundToDevicePixel(floatValueForLength(style.transformOriginY(), borderBox.height()), deviceScaleFactor));
</ins><span class="cx"> origin.setZ(style.transformOriginZ());
</span><span class="cx">
</span><span class="cx"> return origin;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FloatPoint RenderLayerBacking::computePerspectiveOrigin(const LayoutRect& borderBox) const
-{
- const RenderStyle& style = renderer().style();
-
- float boxWidth = borderBox.width();
- float boxHeight = borderBox.height();
-
- FloatPoint origin;
- origin.setX(floatValueForLength(style.perspectiveOriginX(), boxWidth));
- origin.setY(floatValueForLength(style.perspectiveOriginY(), boxHeight));
-
- return origin;
-}
-
</del><span class="cx"> // Return the offset from the top-left of this compositing layer at which the renderer's contents are painted.
</span><span class="cx"> LayoutSize RenderLayerBacking::contentOffsetInCompostingLayer() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (165891 => 165892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-03-19 13:49:41 UTC (rev 165891)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-03-19 14:25:34 UTC (rev 165892)
</span><span class="lines">@@ -250,10 +250,8 @@
</span><span class="cx"> GraphicsLayerPaintingPhase paintingPhaseForPrimaryLayer() const;
</span><span class="cx">
</span><span class="cx"> LayoutSize contentOffsetInCompostingLayer() const;
</span><del>- // Result is transform origin in pixels.
- FloatPoint3D computeTransformOrigin(const LayoutRect& borderBox) const;
- // Result is perspective origin in pixels.
- FloatPoint computePerspectiveOrigin(const LayoutRect& borderBox) const;
</del><ins>+ // Result is transform origin in device pixels.
+ FloatPoint3D computeTransformOriginForPainting(const LayoutRect& borderBox) const;
</ins><span class="cx">
</span><span class="cx"> void updateOpacity(const RenderStyle*);
</span><span class="cx"> void updateTransform(const RenderStyle*);
</span></span></pre>
</div>
</div>
</body>
</html>