<!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>[169690] 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/169690">169690</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-06-09 09:04:31 -0700 (Mon, 09 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Gaps below and to the right of the video controls on devour.com
https://bugs.webkit.org/show_bug.cgi?id=133607
Reviewed by Simon Fraser.
Non-toplevel compositing layers are device pixel aligned. In order to render the content
to the same position as if the layer was not aligned, the graphics layer needs to be translated.
CALayer::bounds is set to compensate for the shifted layer. However, we should not change the layer's
size as that stretches the content and results in overlaps/gaps/extra fuzziness.
Source/WebCore:
Test: compositing/contents-scale/hidpi-compositing-layer-positioned-on-scaled-context.html
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::updateGeometry):
(WebCore::GraphicsLayerCA::computePixelAlignment): remove old epsilon adjustment code.
* platform/graphics/ca/GraphicsLayerCA.h:
LayoutTests:
* compositing/contents-scale/hidpi-compositing-layer-positioned-on-scaled-context-expected.html: Added.
* compositing/contents-scale/hidpi-compositing-layer-positioned-on-scaled-context.html: Added.</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="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositingcontentsscalehidpicompositinglayerpositionedonscaledcontextexpectedhtml">trunk/LayoutTests/compositing/contents-scale/hidpi-compositing-layer-positioned-on-scaled-context-expected.html</a></li>
<li><a href="#trunkLayoutTestscompositingcontentsscalehidpicompositinglayerpositionedonscaledcontexthtml">trunk/LayoutTests/compositing/contents-scale/hidpi-compositing-layer-positioned-on-scaled-context.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169689 => 169690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-06-09 16:01:14 UTC (rev 169689)
+++ trunk/LayoutTests/ChangeLog 2014-06-09 16:04:31 UTC (rev 169690)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-06-09 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] Gaps below and to the right of the video controls on devour.com
+ https://bugs.webkit.org/show_bug.cgi?id=133607
+
+ Reviewed by Simon Fraser.
+
+ Non-toplevel compositing layers are device pixel aligned. In order to render the content
+ to the same position as if the layer was not aligned, the graphics layer needs to be translated.
+ CALayer::bounds is set to compensate for the shifted layer. However, we should not change the layer's
+ size as that stretches the content and results in overlaps/gaps/extra fuzziness.
+
+ * compositing/contents-scale/hidpi-compositing-layer-positioned-on-scaled-context-expected.html: Added.
+ * compositing/contents-scale/hidpi-compositing-layer-positioned-on-scaled-context.html: Added.
+
+2014-06-09 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> [SVG] Subpixel rendering: Mask with transformed text does not render.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133626
</span><span class="cx"> <rdar://problem/17123070>
</span></span></pre></div>
<a id="trunkLayoutTestscompositingcontentsscalehidpicompositinglayerpositionedonscaledcontextexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/contents-scale/hidpi-compositing-layer-positioned-on-scaled-context-expected.html (0 => 169690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/contents-scale/hidpi-compositing-layer-positioned-on-scaled-context-expected.html (rev 0)
+++ trunk/LayoutTests/compositing/contents-scale/hidpi-compositing-layer-positioned-on-scaled-context-expected.html 2014-06-09 16:04:31 UTC (rev 169690)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!DOCTYPE html>
+<head>
+<title>This tests that compositing layer is positioned properly on a scaled context.</title>
+<style>
+ .container {
+ position: absolute;
+ left: 1px;
+ top: 0px;
+ width: 100px;
+ height: 100px;
+ background-color: red;
+ }
+
+ .panel {
+ position: absolute;
+ top: 0px;
+ left: 1px;
+ width: 100px;
+ height: 100px;
+ background-color: blue;
+ }
+
+</style>
+</head>
+<body>
+</body>
+<div class=container></div>
+<div class=panel>foo</div>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingcontentsscalehidpicompositinglayerpositionedonscaledcontexthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/contents-scale/hidpi-compositing-layer-positioned-on-scaled-context.html (0 => 169690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/contents-scale/hidpi-compositing-layer-positioned-on-scaled-context.html (rev 0)
+++ trunk/LayoutTests/compositing/contents-scale/hidpi-compositing-layer-positioned-on-scaled-context.html 2014-06-09 16:04:31 UTC (rev 169690)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<head>
+<title>This tests that compositing layer is positioned properly on a scaled context.</title>
+<style>
+ .container {
+ position: absolute;
+ left: 1px;
+ top: 0px;
+ width: 100px;
+ height: 100px;
+ background-color: red;
+ }
+
+ .panel {
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ width: 100px;
+ height: 100px;
+ background-color: blue;
+
+ -webkit-transform: translateZ(0);
+ }
+
+</style>
+</head>
+<body>
+</body>
+<div class=container>
+ <div class=panel>foo</div>
+</div>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169689 => 169690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-09 16:01:14 UTC (rev 169689)
+++ trunk/Source/WebCore/ChangeLog 2014-06-09 16:04:31 UTC (rev 169690)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-06-09 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] Gaps below and to the right of the video controls on devour.com
+ https://bugs.webkit.org/show_bug.cgi?id=133607
+
+ Reviewed by Simon Fraser.
+
+ Non-toplevel compositing layers are device pixel aligned. In order to render the content
+ to the same position as if the layer was not aligned, the graphics layer needs to be translated.
+ CALayer::bounds is set to compensate for the shifted layer. However, we should not change the layer's
+ size as that stretches the content and results in overlaps/gaps/extra fuzziness.
+
+ Test: compositing/contents-scale/hidpi-compositing-layer-positioned-on-scaled-context.html
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::updateGeometry):
+ (WebCore::GraphicsLayerCA::computePixelAlignment): remove old epsilon adjustment code.
+ * platform/graphics/ca/GraphicsLayerCA.h:
+
+2014-06-09 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> [SVG] Subpixel rendering: Mask with transformed text does not render.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133626
</span><span class="cx"> <rdar://problem/17123070>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (169689 => 169690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-06-09 16:01:14 UTC (rev 169689)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-06-09 16:04:31 UTC (rev 169690)
</span><span class="lines">@@ -1481,10 +1481,8 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: figure out if we really need to pixel align the graphics layer here.
</span><span class="cx"> if (m_client.needsPixelAligment() && !isIntegral(pageScaleFactor) && m_drawsContent && !m_masksToBounds)
</span><del>- computePixelAlignment(pageScaleFactor, positionRelativeToBase, scaledPosition, scaledSize, scaledAnchorPoint, pixelAlignmentOffset);
</del><ins>+ computePixelAlignment(pageScaleFactor, positionRelativeToBase, scaledPosition, scaledAnchorPoint, pixelAlignmentOffset);
</ins><span class="cx">
</span><del>- FloatRect adjustedBounds(m_boundsOrigin - pixelAlignmentOffset, scaledSize);
-
</del><span class="cx"> // Update position.
</span><span class="cx"> // Position is offset on the layer by the layer anchor point.
</span><span class="cx"> FloatPoint adjustedPosition(scaledPosition.x() + scaledAnchorPoint.x() * scaledSize.width(), scaledPosition.y() + scaledAnchorPoint.y() * scaledSize.height());
</span><span class="lines">@@ -1520,7 +1518,9 @@
</span><span class="cx"> adjustedPosition = FloatPoint(scaledAnchorPoint.x() * scaledSize.width() - pixelAlignmentOffset.width(), scaledAnchorPoint.y() * scaledSize.height() - pixelAlignmentOffset.height());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Push the layer to device pixel boundary (setPosition()), but move the content back to its original position (setBounds())
</ins><span class="cx"> m_layer->setPosition(adjustedPosition);
</span><ins>+ FloatRect adjustedBounds = FloatRect(FloatPoint(m_boundsOrigin - pixelAlignmentOffset), m_size);
</ins><span class="cx"> m_layer->setBounds(adjustedBounds);
</span><span class="cx"> m_layer->setAnchorPoint(scaledAnchorPoint);
</span><span class="cx">
</span><span class="lines">@@ -3319,29 +3319,22 @@
</span><span class="cx"> noteLayerPropertyChanged(GeometryChanged | ContentsScaleChanged | ContentsOpaqueChanged);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsLayerCA::computePixelAlignment(float contentsScale, const FloatPoint& positionRelativeToBase,
- FloatPoint& position, FloatSize& size, FloatPoint3D& anchorPoint, FloatSize& alignmentOffset) const
</del><ins>+void GraphicsLayerCA::computePixelAlignment(float pageScale, const FloatPoint& positionRelativeToBase,
+ FloatPoint& position, FloatPoint3D& anchorPoint, FloatSize& alignmentOffset) const
</ins><span class="cx"> {
</span><span class="cx"> FloatRect baseRelativeBounds(positionRelativeToBase, m_size);
</span><span class="cx"> FloatRect scaledBounds = baseRelativeBounds;
</span><ins>+ float contentsScale = pageScale * deviceScaleFactor();
</ins><span class="cx"> // Scale by the page scale factor to compute the screen-relative bounds.
</span><span class="cx"> scaledBounds.scale(contentsScale);
</span><span class="cx"> // Round to integer boundaries.
</span><del>- FloatRect alignedBounds = enclosingIntRect(scaledBounds);
</del><ins>+ FloatRect alignedBounds = enclosingRectForPainting(LayoutRect(scaledBounds), deviceScaleFactor());
</ins><span class="cx">
</span><span class="cx"> // Convert back to layer coordinates.
</span><span class="cx"> alignedBounds.scale(1 / contentsScale);
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
- // Epsilon is necessary to ensure that backing store size computation in CA, which involves integer truncation,
- // will match our aligned bounds.
- const float epsilon = 1e-5f;
- alignedBounds.expand(epsilon, epsilon);
-#endif
-
</del><span class="cx"> alignmentOffset = baseRelativeBounds.location() - alignedBounds.location();
</span><span class="cx"> position = m_position - alignmentOffset;
</span><del>- size = alignedBounds.size();
</del><span class="cx">
</span><span class="cx"> // Now we have to compute a new anchor point which compensates for rounding.
</span><span class="cx"> float anchorPointX = m_anchorPoint.x();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (169689 => 169690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-06-09 16:01:14 UTC (rev 169689)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-06-09 16:04:31 UTC (rev 169690)
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> virtual void dumpAdditionalProperties(TextStream&, int indent, LayerTreeAsTextBehavior) const override;
</span><span class="cx">
</span><span class="cx"> void computePixelAlignment(float contentsScale, const FloatPoint& positionRelativeToBase,
</span><del>- FloatPoint& position, FloatSize&, FloatPoint3D& anchorPoint, FloatSize& alignmentOffset) const;
</del><ins>+ FloatPoint& position, FloatPoint3D& anchorPoint, FloatSize& alignmentOffset) const;
</ins><span class="cx">
</span><span class="cx"> TransformationMatrix layerTransform(const FloatPoint& position, const TransformationMatrix* customTransform = 0) const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>