<!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>[164449] 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/164449">164449</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-02-20 15:04:20 -0800 (Thu, 20 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel rendering: Enable compositing RenderLayer painting on device pixel position.
https://bugs.webkit.org/show_bug.cgi?id=128509
Reviewed by Simon Fraser.
GraphicsLayer is now positioned on device pixel boundary. This enables us to put
compositing layers on a subpixel position and animate them with device pixel
precision.
Source/WebCore:
Tests: fast/sub-pixel/compositing-layers-on-subpixel-position.html
fast/sub-pixel/simple-clipping.html
* platform/LayoutUnit.h:
(WebCore::ceilToDevicePixel):
* platform/graphics/LayoutPoint.h:
(WebCore::flooredForPainting):
(WebCore::ceiledForPainting):
* platform/graphics/LayoutRect.cpp:
(WebCore::enclosingRectForPainting):
* platform/graphics/LayoutRect.h:
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::clipToRect):
* rendering/RenderLayerBacking.cpp:
(WebCore::clipBox):
(WebCore::pixelFractionForLayerPainting):
(WebCore::calculateDevicePixelOffsetFromRenderer):
(WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
(WebCore::RenderLayerBacking::paintIntoLayer):
* rendering/RenderLayerBacking.h:
LayoutTests:
* TestExpectations:
* fast/sub-pixel/compositing-layers-on-subpixel-position-expected.html: Added.
* fast/sub-pixel/compositing-layers-on-subpixel-position.html: Added.
* fast/sub-pixel/simple-clipping-expected.html: Added.
* fast/sub-pixel/simple-clipping.html: Added.
* platform/mac/compositing/layer-creation/overlap-animation-container-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmaccompositinglayercreationoverlapanimationcontainerexpectedtxt">trunk/LayoutTests/platform/mac/compositing/layer-creation/overlap-animation-container-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformLayoutUnith">trunk/Source/WebCore/platform/LayoutUnit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutPointh">trunk/Source/WebCore/platform/graphics/LayoutPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutRectcpp">trunk/Source/WebCore/platform/graphics/LayoutRect.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutRecth">trunk/Source/WebCore/platform/graphics/LayoutRect.h</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>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastsubpixelcompositinglayersonsubpixelpositionexpectedhtml">trunk/LayoutTests/fast/sub-pixel/compositing-layers-on-subpixel-position-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastsubpixelcompositinglayersonsubpixelpositionhtml">trunk/LayoutTests/fast/sub-pixel/compositing-layers-on-subpixel-position.html</a></li>
<li><a href="#trunkLayoutTestsfastsubpixelsimpleclippingexpectedhtml">trunk/LayoutTests/fast/sub-pixel/simple-clipping-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastsubpixelsimpleclippinghtml">trunk/LayoutTests/fast/sub-pixel/simple-clipping.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164448 => 164449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-20 22:55:11 UTC (rev 164448)
+++ trunk/LayoutTests/ChangeLog 2014-02-20 23:04:20 UTC (rev 164449)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-02-20 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Enable compositing RenderLayer painting on device pixel position.
+ https://bugs.webkit.org/show_bug.cgi?id=128509
+
+ Reviewed by Simon Fraser.
+
+ GraphicsLayer is now positioned on device pixel boundary. This enables us to put
+ compositing layers on a subpixel position and animate them with device pixel
+ precision.
+
+ * TestExpectations:
+ * fast/sub-pixel/compositing-layers-on-subpixel-position-expected.html: Added.
+ * fast/sub-pixel/compositing-layers-on-subpixel-position.html: Added.
+ * fast/sub-pixel/simple-clipping-expected.html: Added.
+ * fast/sub-pixel/simple-clipping.html: Added.
+ * platform/mac/compositing/layer-creation/overlap-animation-container-expected.txt:
+
</ins><span class="cx"> 2014-02-20 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> Unskip fast/workers/use-machine-stack.html
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (164448 => 164449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2014-02-20 22:55:11 UTC (rev 164448)
+++ trunk/LayoutTests/TestExpectations 2014-02-20 23:04:20 UTC (rev 164449)
</span><span class="lines">@@ -102,3 +102,7 @@
</span><span class="cx"> webkit.org/b/83618 fast/dom/inline-event-attributes-release.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/129057 media/controls-styling-strict.html [ Pass Failure ]
</span><ins>+
+#subpixel failure on non-retina displays.
+webkit.org/b/129050 fast/sub-pixel/compositing-layers-on-subpixel-position.html [ Failure ]
+webkit.org/b/129113 fast/multicol/newmulticol/clipping.html [ Failure ]
</ins></span></pre></div>
<a id="trunkLayoutTestsfastsubpixelcompositinglayersonsubpixelpositionexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/sub-pixel/compositing-layers-on-subpixel-position-expected.html (0 => 164449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/sub-pixel/compositing-layers-on-subpixel-position-expected.html (rev 0)
+++ trunk/LayoutTests/fast/sub-pixel/compositing-layers-on-subpixel-position-expected.html 2014-02-20 23:04:20 UTC (rev 164449)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we properly position render layers when composition is introduced.</title>
+<style>
+ div {
+ background-color: black;
+ position: absolute;
+ }
+ .parent {
+ background-color: red;
+ }
+</style>
+</head>
+<body>
+<p id="container"></p>
+<script>
+ var childPos = -2;
+ function createGrid(topPos, leftPos) {
+ var container = document.getElementById("container");
+ localTopPos = topPos;
+ localLeftPos = leftPos;
+ for (var i = 0; i < 10; ++i, localTopPos = localTopPos + 7) {
+ localLeftPos = leftPos;
+ for (var j = 0; j < 10; ++j, localLeftPos = localLeftPos + 7, childPos = childPos < 2 ? childPos + 0.1 : -2) {
+ var outer = document.createElement("div");
+ outer.className = "parent";
+ outer.style.top = localTopPos + "px";
+ outer.style.left = localLeftPos + "px";
+ outer.style.width = "4px";
+ outer.style.height = "4px";
+
+ var inner = document.createElement("div");
+ inner.style.top = childPos + "px";
+ inner.style.left = childPos + "px";
+ inner.style.width = "2px";
+ inner.style.height = "2px";
+
+ outer.appendChild(inner);
+ container.appendChild(outer);
+ }
+ }
+ }
+
+ for (var i = 0; i < 10; ++i)
+ createGrid(i * 0.1, i * 70.1);
+</script>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastsubpixelcompositinglayersonsubpixelpositionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/sub-pixel/compositing-layers-on-subpixel-position.html (0 => 164449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/sub-pixel/compositing-layers-on-subpixel-position.html (rev 0)
+++ trunk/LayoutTests/fast/sub-pixel/compositing-layers-on-subpixel-position.html 2014-02-20 23:04:20 UTC (rev 164449)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we properly position render layers when composition is introduced.</title>
+<style>
+ div {
+ background-color: black;
+ position: absolute;
+ }
+ .parent {
+ background-color: red;
+ -webkit-transform: translateZ(0);
+ }
+</style>
+</head>
+<body>
+<p id="container"></p>
+<script>
+ var childPos = -2;
+ function createGrid(topPos, leftPos) {
+ var container = document.getElementById("container");
+ localTopPos = topPos;
+ localLeftPos = leftPos;
+ for (var i = 0; i < 10; ++i, localTopPos = localTopPos + 7) {
+ localLeftPos = leftPos;
+ for (var j = 0; j < 10; ++j, localLeftPos = localLeftPos + 7, childPos = childPos < 2 ? childPos + 0.1 : -2) {
+ var outer = document.createElement("div");
+ outer.className = "parent";
+ outer.style.top = localTopPos + "px";
+ outer.style.left = localLeftPos + "px";
+ outer.style.width = "4px";
+ outer.style.height = "4px";
+
+ var inner = document.createElement("div");
+ inner.style.top = childPos + "px";
+ inner.style.left = childPos + "px";
+ inner.style.width = "2px";
+ inner.style.height = "2px";
+
+ outer.appendChild(inner);
+ container.appendChild(outer);
+ }
+ }
+ }
+
+ for (var i = 0; i < 10; ++i)
+ createGrid(i * 0.1, i * 70.1);
+</script>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastsubpixelsimpleclippingexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/sub-pixel/simple-clipping-expected.html (0 => 164449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/sub-pixel/simple-clipping-expected.html (rev 0)
+++ trunk/LayoutTests/fast/sub-pixel/simple-clipping-expected.html 2014-02-20 23:04:20 UTC (rev 164449)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>Simple clipping. This tests that we properly clip device pixel positioned elements.</title>
+<style>
+ div {
+ width: 20px;
+ height: 20px;
+ border: solid 1px red;
+ position: absolute;
+ top: 0px;
+ }
+</style>
+</head>
+<body>
+<p id="container"></p>
+
+<script>
+ var container = document.getElementById("container");
+ for (i = 0; i < 100; i = i + 21) {
+ var e1 = document.createElement("div");
+ var e2 = document.createElement("div");
+ var e3 = document.createElement("div");
+
+ e1.style.left = i + 101 + "px";
+
+ e2.style.top = "22px";
+ e2.style.left = i + 101.5 +"px";
+
+ e3.style.top = "44px";
+ e3.style.left = i + 102 + "px";
+
+ container.appendChild(e1);
+ container.appendChild(e2);
+ container.appendChild(e3);
+ }
+</script>
+
+</body>
+</html>
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastsubpixelsimpleclippinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/sub-pixel/simple-clipping.html (0 => 164449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/sub-pixel/simple-clipping.html (rev 0)
+++ trunk/LayoutTests/fast/sub-pixel/simple-clipping.html 2014-02-20 23:04:20 UTC (rev 164449)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>Simple clipping. This tests that we properly clip device pixel positioned elements.</title>
+<style>
+ div {
+ width: 20px;
+ height: 20px;
+ border: solid 1px red;
+ position: absolute;
+ top: 0px;
+ -webkit-transform: translateZ(0);
+ }
+</style>
+<script>
+ if (window.testRunner)
+ window.testRunner.waitUntilDone();
+
+ function moveBoxes() {
+ var boxes = document.getElementsByTagName("div");
+
+ for (var i = 0; i < boxes.length; i++)
+ boxes[i].style.left = parseFloat(boxes[i].style.left) + 100.5 + 'px';
+
+ if (window.testRunner)
+ window.testRunner.notifyDone();
+ }
+</script>
+</head>
+<body onload="setTimeout(moveBoxes, 0);">
+<p id="container"></p>
+<script>
+ var container = document.getElementById("container");
+ for (i = 0; i < 100; i = i + 21) {
+ var e1 = document.createElement("div");
+ var e2 = document.createElement("div");
+ var e3 = document.createElement("div");
+
+ e1.style.left = i + 0.5 + "px";
+
+ e2.style.top = "22px";
+ e2.style.left = i + 1 +"px";
+
+ e3.style.top = "44px";
+ e3.style.left = i + 1.5 + "px";
+
+ container.appendChild(e1);
+ container.appendChild(e2);
+ container.appendChild(e3);
+ }
+</script>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmaccompositinglayercreationoverlapanimationcontainerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/compositing/layer-creation/overlap-animation-container-expected.txt (164448 => 164449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/compositing/layer-creation/overlap-animation-container-expected.txt 2014-02-20 22:55:11 UTC (rev 164448)
+++ trunk/LayoutTests/platform/mac/compositing/layer-creation/overlap-animation-container-expected.txt 2014-02-20 23:04:20 UTC (rev 164449)
</span><span class="lines">@@ -12,12 +12,12 @@
</span><span class="cx"> (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 -110.00 0.00 1.00])
</span><span class="cx"> )
</span><span class="cx"> (GraphicsLayer
</span><del>- (position 47.00 229.00)
- (bounds 144.00 454.00)
</del><ins>+ (position 46.00 229.00)
+ (bounds 146.00 454.00)
</ins><span class="cx"> (drawsContent 1)
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (position 21.00 11.00)
</del><ins>+ (position 21.13 11.00)
</ins><span class="cx"> (bounds 102.00 102.00)
</span><span class="cx"> (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 -1.00 1.00])
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164448 => 164449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-20 22:55:11 UTC (rev 164448)
+++ trunk/Source/WebCore/ChangeLog 2014-02-20 23:04:20 UTC (rev 164449)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-02-20 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Enable compositing RenderLayer painting on device pixel position.
+ https://bugs.webkit.org/show_bug.cgi?id=128509
+
+ Reviewed by Simon Fraser.
+
+ GraphicsLayer is now positioned on device pixel boundary. This enables us to put
+ compositing layers on a subpixel position and animate them with device pixel
+ precision.
+
+ Tests: fast/sub-pixel/compositing-layers-on-subpixel-position.html
+ fast/sub-pixel/simple-clipping.html
+
+ * platform/LayoutUnit.h:
+ (WebCore::ceilToDevicePixel):
+ * platform/graphics/LayoutPoint.h:
+ (WebCore::flooredForPainting):
+ (WebCore::ceiledForPainting):
+ * platform/graphics/LayoutRect.cpp:
+ (WebCore::enclosingRectForPainting):
+ * platform/graphics/LayoutRect.h:
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::clipToRect):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::clipBox):
+ (WebCore::pixelFractionForLayerPainting):
+ (WebCore::calculateDevicePixelOffsetFromRenderer):
+ (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
+ (WebCore::RenderLayerBacking::paintIntoLayer):
+ * rendering/RenderLayerBacking.h:
+
</ins><span class="cx"> 2014-02-20 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> Rename border/padding/margin width/height to horizontal/vertical extent on RenderBoxModelObject
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLayoutUnith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LayoutUnit.h (164448 => 164449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LayoutUnit.h 2014-02-20 22:55:11 UTC (rev 164448)
+++ trunk/Source/WebCore/platform/LayoutUnit.h 2014-02-20 23:04:20 UTC (rev 164449)
</span><span class="lines">@@ -945,6 +945,11 @@
</span><span class="cx"> return floorf((value.rawValue() * pixelSnappingFactor) / kEffectiveFixedPointDenominator) / pixelSnappingFactor;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline float ceilToDevicePixel(LayoutUnit value, float pixelSnappingFactor)
+{
+ return ceilf((value.rawValue() * pixelSnappingFactor) / kEffectiveFixedPointDenominator) / pixelSnappingFactor;
+}
+
</ins><span class="cx"> inline float snapSizeToDevicePixel(LayoutUnit size, LayoutUnit location, float pixelSnappingFactor)
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit fraction = location.fraction();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/LayoutPoint.h (164448 => 164449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/LayoutPoint.h 2014-02-20 22:55:11 UTC (rev 164448)
+++ trunk/Source/WebCore/platform/graphics/LayoutPoint.h 2014-02-20 23:04:20 UTC (rev 164449)
</span><span class="lines">@@ -185,6 +185,26 @@
</span><span class="cx"> return IntSize(snapSizeToPixel(s.width(), p.x()), snapSizeToPixel(s.height(), p.y()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline FloatPoint flooredForPainting(const LayoutPoint& point, float pixelSnappingFactor)
+{
+#if ENABLE(SUBPIXEL_LAYOUT)
+ return FloatPoint(floorToDevicePixel(point.x(), pixelSnappingFactor), floorToDevicePixel(point.y(), pixelSnappingFactor));
+#else
+ UNUSED_PARAM(pixelSnappingFactor);
+ return FloatPoint(point);
+#endif
+}
+
+inline FloatPoint ceiledForPainting(const LayoutPoint& point, float pixelSnappingFactor)
+{
+#if ENABLE(SUBPIXEL_LAYOUT)
+ return FloatPoint(ceilToDevicePixel(point.x(), pixelSnappingFactor), ceilToDevicePixel(point.y(), pixelSnappingFactor));
+#else
+ UNUSED_PARAM(pixelSnappingFactor);
+ return FloatPoint(point);
+#endif
+}
+
</ins><span class="cx"> inline LayoutPoint roundedLayoutPoint(const FloatPoint& p)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SUBPIXEL_LAYOUT)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutRectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/LayoutRect.cpp (164448 => 164449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/LayoutRect.cpp 2014-02-20 22:55:11 UTC (rev 164448)
+++ trunk/Source/WebCore/platform/graphics/LayoutRect.cpp 2014-02-20 23:04:20 UTC (rev 164449)
</span><span class="lines">@@ -147,4 +147,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+FloatRect enclosingRectForPainting(const LayoutRect& rect, float pixelSnappingFactor)
+{
+ FloatPoint location = flooredForPainting(rect.minXMinYCorner(), pixelSnappingFactor);
+ FloatPoint maxPoint = ceiledForPainting(rect.maxXMaxYCorner(), pixelSnappingFactor);
+
+ return FloatRect(location, maxPoint - location);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/LayoutRect.h (164448 => 164449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/LayoutRect.h 2014-02-20 22:55:11 UTC (rev 164448)
+++ trunk/Source/WebCore/platform/graphics/LayoutRect.h 2014-02-20 23:04:20 UTC (rev 164449)
</span><span class="lines">@@ -214,8 +214,8 @@
</span><span class="cx">
</span><span class="cx"> IntRect enclosingIntRect(const LayoutRect&);
</span><span class="cx"> LayoutRect enclosingLayoutRect(const FloatRect&);
</span><ins>+FloatRect enclosingRectForPainting(const LayoutRect&, float pixelSnappingFactor);
</ins><span class="cx">
</span><del>-
</del><span class="cx"> inline IntRect pixelSnappedIntRect(LayoutUnit left, LayoutUnit top, LayoutUnit width, LayoutUnit height)
</span><span class="cx"> {
</span><span class="cx"> return IntRect(left.round(), top.round(), snapSizeToPixel(width, left), snapSizeToPixel(height, top));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (164448 => 164449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-02-20 22:55:11 UTC (rev 164448)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-02-20 23:04:20 UTC (rev 164449)
</span><span class="lines">@@ -3572,7 +3572,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (clipRect.rect() != paintDirtyRect || clipRect.hasRadius()) {
</span><span class="cx"> context->save();
</span><del>- context->clip(pixelSnappedIntRect(clipRect.rect()));
</del><ins>+ context->clip(clipRect.rect());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!clipRect.hasRadius())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (164448 => 164449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-02-20 22:55:11 UTC (rev 164448)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-02-20 23:04:20 UTC (rev 164449)
</span><span class="lines">@@ -642,9 +642,25 @@
</span><span class="cx"> if (renderer.hasClip())
</span><span class="cx"> result.intersect(renderer.clipRect(LayoutPoint(), 0)); // FIXME: Incorrect for CSS regions.
</span><span class="cx">
</span><del>- return pixelSnappedIntRect(result);
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static FloatSize pixelFractionForLayerPainting(const LayoutPoint& point, float pixelSnappingFactor)
+{
+ LayoutUnit x = point.x();
+ LayoutUnit y = point.y();
+ x = x >= 0 ? floorToDevicePixel(x, pixelSnappingFactor) : ceilToDevicePixel(x, pixelSnappingFactor);
+ y = y >= 0 ? floorToDevicePixel(y, pixelSnappingFactor) : ceilToDevicePixel(y, pixelSnappingFactor);
+ return point - LayoutPoint(x, y);
+}
+
+static void calculateDevicePixelOffsetFromRenderer(const LayoutSize& rendererOffsetFromGraphicsLayer, FloatSize& devicePixelOffsetFromRenderer,
+ LayoutSize& devicePixelFractionFromRenderer, float deviceScaleFactor)
+{
+ devicePixelFractionFromRenderer = LayoutSize(pixelFractionForLayerPainting(toLayoutPoint(rendererOffsetFromGraphicsLayer), deviceScaleFactor));
+ devicePixelOffsetFromRenderer = rendererOffsetFromGraphicsLayer - devicePixelFractionFromRenderer;
+}
+
</ins><span class="cx"> void RenderLayerBacking::updateGraphicsLayerGeometry()
</span><span class="cx"> {
</span><span class="cx"> // If we haven't built z-order lists yet, wait until later.
</span><span class="lines">@@ -689,21 +705,50 @@
</span><span class="cx"> LayoutRect ancestorCompositingBounds;
</span><span class="cx"> if (compAncestor) {
</span><span class="cx"> ASSERT(compAncestor->backing());
</span><del>- ancestorCompositingBounds = pixelSnappedIntRect(compAncestor->backing()->compositedBounds());
</del><ins>+ ancestorCompositingBounds = compAncestor->backing()->compositedBounds();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- LayoutRect localRawCompositingBounds = compositedBounds();
- LayoutPoint rawDelta;
- m_owningLayer.convertToLayerCoords(compAncestor, rawDelta, RenderLayer::AdjustForColumns);
- IntPoint delta = flooredIntPoint(rawDelta);
- m_subpixelAccumulation = toLayoutSize(rawDelta.fraction());
- // Move the bounds by the subpixel accumulation so that it pixel-snaps relative to absolute pixels instead of local coordinates.
- localRawCompositingBounds.move(m_subpixelAccumulation);
-
- LayoutRect localCompositingBounds = pixelSnappedIntRect(localRawCompositingBounds);
</del><ins>+ /*
+ * GraphicsLayer: device pixel positioned. Floored, enclosing rect.
+ * RenderLayer: subpixel positioned.
+ * Offset from renderer (GraphicsLayer <-> RenderLayer::renderer()): subpixel based offset.
+ *
+ * relativeCompositingBounds
+ * _______________________________________
+ * |\ GraphicsLayer |
+ * | \ |
+ * | \ offset from renderer: (device pixel + subpixel)
+ * | \ |
+ * | \______________________________ |
+ * | | localCompositingBounds | |
+ * | | | |
+ * | | RenderLayer::renderer() | |
+ * | | | |
+ *
+ * localCompositingBounds: this RenderLayer relative to its renderer().
+ * relativeCompositingBounds: this RenderLayer relative to its parent compositing layer.
+ * enclosingRelativeCompositingBounds: this RenderLayer relative to its parent but floored to device pixel position.
+ * rendererOffsetFromGraphicsLayer: RenderLayer::renderer()'s offset from its enclosing GraphicsLayer.
+ * devicePixelOffsetFromRenderer: rendererOffsetFromGraphicsLayer's device pixel part. (6.9px -> 6.5px in case of 2x display)
+ * devicePixelFractionFromRenderer: rendererOffsetFromGraphicsLayer's fractional part (6.9px -> 0.4px in case of 2x display)
+ */
+ float deviceScaleFactor = this->deviceScaleFactor();
+ LayoutRect localCompositingBounds = compositedBounds();
</ins><span class="cx"> LayoutRect relativeCompositingBounds(localCompositingBounds);
</span><del>- relativeCompositingBounds.moveBy(delta);
</del><span class="cx">
</span><ins>+ LayoutPoint offsetFromParent;
+ m_owningLayer.convertToLayerCoords(compAncestor, offsetFromParent, RenderLayer::AdjustForColumns);
+ relativeCompositingBounds.moveBy(offsetFromParent);
+
+ LayoutRect enclosingRelativeCompositingBounds = LayoutRect(enclosingRectForPainting(relativeCompositingBounds, deviceScaleFactor));
+ LayoutSize subpixelOffsetAdjustment = enclosingRelativeCompositingBounds.location() - relativeCompositingBounds.location();
+ LayoutSize rendererOffsetFromGraphicsLayer = toLayoutSize(localCompositingBounds.location()) + subpixelOffsetAdjustment;
+
+ FloatSize devicePixelOffsetFromRenderer;
+ LayoutSize devicePixelFractionFromRenderer;
+ calculateDevicePixelOffsetFromRenderer(rendererOffsetFromGraphicsLayer, devicePixelOffsetFromRenderer, devicePixelFractionFromRenderer, deviceScaleFactor);
+ m_devicePixelFractionFromRenderer = LayoutSize(fabs(devicePixelFractionFromRenderer.width().toFloat()), fabs(devicePixelFractionFromRenderer.height().toFloat()));
+
</ins><span class="cx"> adjustAncestorCompositingBoundsForFlowThread(ancestorCompositingBounds, compAncestor);
</span><span class="cx">
</span><span class="cx"> LayoutPoint graphicsLayerParentLocation;
</span><span class="lines">@@ -741,40 +786,39 @@
</span><span class="cx"> // layer. Note that we call it with temporaryClipRects = true because normally when computing clip rects
</span><span class="cx"> // for a compositing layer, rootLayer is the layer itself.
</span><span class="cx"> RenderLayer::ClipRectsContext clipRectsContext(compAncestor, 0, TemporaryClipRects, IgnoreOverlayScrollbarSize, IgnoreOverflowClip);
</span><del>- LayoutRect parentClipRect = pixelSnappedIntRect(m_owningLayer.backgroundClipRect(clipRectsContext).rect()); // FIXME: Incorrect for CSS regions.
</del><ins>+ LayoutRect parentClipRect = m_owningLayer.backgroundClipRect(clipRectsContext).rect(); // FIXME: Incorrect for CSS regions.
</ins><span class="cx"> ASSERT(parentClipRect != LayoutRect::infiniteRect());
</span><span class="cx"> m_ancestorClippingLayer->setPosition(FloatPoint(parentClipRect.location() - graphicsLayerParentLocation));
</span><span class="cx"> m_ancestorClippingLayer->setSize(parentClipRect.size());
</span><span class="cx">
</span><span class="cx"> // backgroundRect is relative to compAncestor, so subtract deltaX/deltaY to get back to local coords.
</span><del>- m_ancestorClippingLayer->setOffsetFromRenderer(parentClipRect.location() - delta);
</del><ins>+ m_ancestorClippingLayer->setOffsetFromRenderer(parentClipRect.location() - offsetFromParent);
</ins><span class="cx">
</span><span class="cx"> // The primary layer is then parented in, and positioned relative to this clipping layer.
</span><span class="cx"> graphicsLayerParentLocation = parentClipRect.location();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LayoutSize contentsSize = relativeCompositingBounds.size();
</del><ins>+ LayoutSize contentsSize = enclosingRelativeCompositingBounds.size();
</ins><span class="cx">
</span><span class="cx"> if (m_contentsContainmentLayer) {
</span><span class="cx"> m_contentsContainmentLayer->setPreserves3D(preserves3D);
</span><del>- m_contentsContainmentLayer->setPosition(FloatPoint(relativeCompositingBounds.location() - graphicsLayerParentLocation));
</del><ins>+ m_contentsContainmentLayer->setPosition(FloatPoint(enclosingRelativeCompositingBounds.location() - graphicsLayerParentLocation));
</ins><span class="cx"> // Use the same size as m_graphicsLayer so transforms behave correctly.
</span><span class="cx"> m_contentsContainmentLayer->setSize(contentsSize);
</span><del>- graphicsLayerParentLocation = relativeCompositingBounds.location();
</del><ins>+ graphicsLayerParentLocation = enclosingRelativeCompositingBounds.location();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- m_graphicsLayer->setPosition(FloatPoint(relativeCompositingBounds.location() - graphicsLayerParentLocation));
</del><ins>+ m_graphicsLayer->setPosition(FloatPoint(enclosingRelativeCompositingBounds.location() - graphicsLayerParentLocation));
</ins><span class="cx"> m_graphicsLayer->setSize(contentsSize);
</span><del>- FloatSize offsetFromRenderer = toLayoutSize(localCompositingBounds.location());
- if (offsetFromRenderer != m_graphicsLayer->offsetFromRenderer()) {
- m_graphicsLayer->setOffsetFromRenderer(offsetFromRenderer);
</del><ins>+ if (devicePixelOffsetFromRenderer != m_graphicsLayer->offsetFromRenderer()) {
+ m_graphicsLayer->setOffsetFromRenderer(devicePixelOffsetFromRenderer);
</ins><span class="cx"> positionOverflowControlsLayers();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_isMainFrameRenderViewLayer) {
</span><span class="cx"> // For non-root layers, background is always painted by the primary graphics layer.
</span><span class="cx"> ASSERT(!m_backgroundLayer);
</span><del>- bool hadSubpixelRounding = relativeCompositingBounds.size() != localRawCompositingBounds.size();
</del><ins>+ bool hadSubpixelRounding = !m_devicePixelFractionFromRenderer.isEmpty();
</ins><span class="cx"> m_graphicsLayer->setContentsOpaque(!hadSubpixelRounding && m_owningLayer.backgroundIsKnownToBeOpaqueInRect(localCompositingBounds));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -797,14 +841,14 @@
</span><span class="cx"> const LayoutRect borderBox = toRenderBox(renderer()).pixelSnappedBorderBoxRect();
</span><span class="cx">
</span><span class="cx"> // Get layout bounds in the coords of compAncestor to match relativeCompositingBounds.
</span><del>- LayoutRect layerBounds(delta, borderBox.size());
</del><ins>+ LayoutRect layerBounds(offsetFromParent, borderBox.size());
</ins><span class="cx">
</span><span class="cx"> // Update properties that depend on layer dimensions
</span><span class="cx"> FloatPoint3D transformOrigin = computeTransformOrigin(borderBox);
</span><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(relativeCompositingBounds.width() != 0.0f ? ((layerBounds.x() - relativeCompositingBounds.x()) + transformOrigin.x()) / relativeCompositingBounds.width() : 0.5f,
- relativeCompositingBounds.height() != 0.0f ? ((layerBounds.y() - relativeCompositingBounds.y()) + transformOrigin.y()) / relativeCompositingBounds.height() : 0.5f,
- transformOrigin.z());
</del><ins>+ 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());
</ins><span class="cx"> if (m_contentsContainmentLayer)
</span><span class="cx"> m_contentsContainmentLayer->setAnchorPoint(anchor);
</span><span class="cx"> else
</span><span class="lines">@@ -876,15 +920,15 @@
</span><span class="cx"> if (m_scrollingLayer) {
</span><span class="cx"> ASSERT(m_scrollingContentsLayer);
</span><span class="cx"> RenderBox& renderBox = toRenderBox(renderer());
</span><del>- IntRect paddingBox(renderBox.borderLeft(), renderBox.borderTop(), renderBox.width() - renderBox.borderLeft() - renderBox.borderRight(), renderBox.height() - renderBox.borderTop() - renderBox.borderBottom());
- IntSize scrollOffset = m_owningLayer.scrollOffset();
</del><ins>+ LayoutRect paddingBox(renderBox.borderLeft(), renderBox.borderTop(), renderBox.width() - renderBox.borderLeft() - renderBox.borderRight(), renderBox.height() - renderBox.borderTop() - renderBox.borderBottom());
+ LayoutSize scrollOffset = m_owningLayer.scrollOffset();
</ins><span class="cx">
</span><span class="cx"> m_scrollingLayer->setPosition(FloatPoint(paddingBox.location() - localCompositingBounds.location()));
</span><span class="cx">
</span><span class="cx"> m_scrollingLayer->setSize(paddingBox.size());
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> FloatSize oldScrollingLayerOffset = m_scrollingLayer->offsetFromRenderer();
</span><del>- m_scrollingLayer->setOffsetFromRenderer(IntPoint() - paddingBox.location());
</del><ins>+ m_scrollingLayer->setOffsetFromRenderer(FloatPoint() - paddingBox.location());
</ins><span class="cx"> bool paddingBoxOffsetChanged = oldScrollingLayerOffset != m_scrollingLayer->offsetFromRenderer();
</span><span class="cx">
</span><span class="cx"> if (m_owningLayer.isInUserScroll()) {
</span><span class="lines">@@ -914,7 +958,7 @@
</span><span class="cx"> m_scrollingContentsLayer->setPosition(FloatPoint(-scrollOffset.width(), -scrollOffset.height()));
</span><span class="cx">
</span><span class="cx"> FloatSize oldScrollingLayerOffset = m_scrollingLayer->offsetFromRenderer();
</span><del>- m_scrollingLayer->setOffsetFromRenderer(-toIntSize(paddingBox.location()));
</del><ins>+ m_scrollingLayer->setOffsetFromRenderer(-toFloatSize(paddingBox.location()));
</ins><span class="cx">
</span><span class="cx"> bool paddingBoxOffsetChanged = oldScrollingLayerOffset != m_scrollingLayer->offsetFromRenderer();
</span><span class="cx">
</span><span class="lines">@@ -922,7 +966,7 @@
</span><span class="cx"> if (scrollSize != m_scrollingContentsLayer->size() || paddingBoxOffsetChanged)
</span><span class="cx"> m_scrollingContentsLayer->setNeedsDisplay();
</span><span class="cx">
</span><del>- IntSize scrollingContentsOffset = toIntSize(paddingBox.location() - scrollOffset);
</del><ins>+ LayoutSize scrollingContentsOffset = toLayoutSize(paddingBox.location() - scrollOffset);
</ins><span class="cx"> if (scrollingContentsOffset != m_scrollingContentsLayer->offsetFromRenderer() || scrollSize != m_scrollingContentsLayer->size())
</span><span class="cx"> compositor().scrollingLayerDidChange(m_owningLayer);
</span><span class="cx">
</span><span class="lines">@@ -938,7 +982,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If this layer was created just for clipping or to apply perspective, it doesn't need its own backing store.
</span><del>- setRequiresOwnBackingStore(compositor().requiresOwnBackingStore(m_owningLayer, compAncestor, relativeCompositingBounds, ancestorCompositingBounds));
</del><ins>+ setRequiresOwnBackingStore(compositor().requiresOwnBackingStore(m_owningLayer, compAncestor, enclosingRelativeCompositingBounds, ancestorCompositingBounds));
</ins><span class="cx">
</span><span class="cx"> bool didUpdateContentsRect = false;
</span><span class="cx"> updateDirectlyCompositedContents(isSimpleContainer, didUpdateContentsRect);
</span><span class="lines">@@ -2161,7 +2205,7 @@
</span><span class="cx"> paintFlags |= RenderLayer::PaintLayerPaintingSkipRootBackground;
</span><span class="cx">
</span><span class="cx"> // FIXME: GraphicsLayers need a way to split for RenderRegions.
</span><del>- RenderLayer::LayerPaintingInfo paintingInfo(&m_owningLayer, paintDirtyRect, paintBehavior, m_subpixelAccumulation);
</del><ins>+ RenderLayer::LayerPaintingInfo paintingInfo(&m_owningLayer, paintDirtyRect, paintBehavior, m_devicePixelFractionFromRenderer);
</ins><span class="cx"> m_owningLayer.paintLayerContents(context, paintingInfo, paintFlags);
</span><span class="cx">
</span><span class="cx"> if (m_owningLayer.containsDirtyOverlayScrollbars())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (164448 => 164449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-02-20 22:55:11 UTC (rev 164448)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-02-20 23:04:20 UTC (rev 164449)
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> uint64_t m_scrollLayerID;
</span><span class="cx">
</span><span class="cx"> LayoutRect m_compositedBounds;
</span><del>- LayoutSize m_subpixelAccumulation; // The accumulated subpixel offset of the compositedBounds compared to absolute coordinates.
</del><ins>+ LayoutSize m_devicePixelFractionFromRenderer;
</ins><span class="cx">
</span><span class="cx"> bool m_artificiallyInflatedBounds; // bounds had to be made non-zero to make transform-origin work
</span><span class="cx"> bool m_isMainFrameRenderViewLayer;
</span></span></pre>
</div>
</div>
</body>
</html>