<!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>[171000] 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/171000">171000</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-07-11 07:19:12 -0700 (Fri, 11 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel rendering: icloud.com password arrow has clipped circle at some window sizes.
https://bugs.webkit.org/show_bug.cgi?id=134824
<rdar://problem/17612729>
Reviewed by Simon Fraser.
Transparent layer clipping needs device pixel offset adjusting.
Source/WebCore:
Test: fast/layers/wrong-clipping-semi-transparent-compositing-layer-on-subpixel-position.html
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::beginTransparencyLayers):
(WebCore::RenderLayer::paintLayer):
(WebCore::RenderLayer::paintLayerContents):
(WebCore::RenderLayer::paintBackgroundForFragments):
(WebCore::RenderLayer::paintForegroundForFragments):
* rendering/RenderLayer.h:
LayoutTests:
* fast/layers/wrong-clipping-semi-transparent-compositing-layer-on-subpixel-position-expected.html: Added.
* fast/layers/wrong-clipping-semi-transparent-compositing-layer-on-subpixel-position.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="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastlayerswrongclippingsemitransparentcompositinglayeronsubpixelpositionexpectedhtml">trunk/LayoutTests/fast/layers/wrong-clipping-semi-transparent-compositing-layer-on-subpixel-position-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastlayerswrongclippingsemitransparentcompositinglayeronsubpixelpositionhtml">trunk/LayoutTests/fast/layers/wrong-clipping-semi-transparent-compositing-layer-on-subpixel-position.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (170999 => 171000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-07-11 12:26:08 UTC (rev 170999)
+++ trunk/LayoutTests/ChangeLog 2014-07-11 14:19:12 UTC (rev 171000)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-07-11 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: icloud.com password arrow has clipped circle at some window sizes.
+ https://bugs.webkit.org/show_bug.cgi?id=134824
+ <rdar://problem/17612729>
+
+ Reviewed by Simon Fraser.
+
+ Transparent layer clipping needs device pixel offset adjusting.
+
+ * fast/layers/wrong-clipping-semi-transparent-compositing-layer-on-subpixel-position-expected.html: Added.
+ * fast/layers/wrong-clipping-semi-transparent-compositing-layer-on-subpixel-position.html: Added.
+
</ins><span class="cx"> 2014-07-11 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Update grid-auto-flow to the new syntax
</span></span></pre></div>
<a id="trunkLayoutTestsfastlayerswrongclippingsemitransparentcompositinglayeronsubpixelpositionexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/layers/wrong-clipping-semi-transparent-compositing-layer-on-subpixel-position-expected.html (0 => 171000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/layers/wrong-clipping-semi-transparent-compositing-layer-on-subpixel-position-expected.html (rev 0)
+++ trunk/LayoutTests/fast/layers/wrong-clipping-semi-transparent-compositing-layer-on-subpixel-position-expected.html 2014-07-11 14:19:12 UTC (rev 171000)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that semi-transparent layers with compositing parent on subpixel position get clipped properly. Non-retina test only.</title>
+<style>
+ img {
+ opacity: 0.9;
+ position: absolute;
+ width: 5px;
+ height: 5px;
+ }
+</style>
+</head>
+<body>
+<p id="container"></p>
+<script>
+ var container = document.getElementById("container");
+ var adjustment = 1;
+ for (i = 0; i < 20; ++i) {
+ for (j = 0; j < 20; ++j) {
+ if (j % 5 == 0 && j != 0)
+ adjustment += 0.5;
+ var e = document.createElement("img");
+ e.style.top = (20 * i) + adjustment + "px";
+ e.style.left = (20 * j) + adjustment + "px";
+ container.appendChild(e);
+ }
+ adjustment += 0.5;
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastlayerswrongclippingsemitransparentcompositinglayeronsubpixelpositionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/layers/wrong-clipping-semi-transparent-compositing-layer-on-subpixel-position.html (0 => 171000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/layers/wrong-clipping-semi-transparent-compositing-layer-on-subpixel-position.html (rev 0)
+++ trunk/LayoutTests/fast/layers/wrong-clipping-semi-transparent-compositing-layer-on-subpixel-position.html 2014-07-11 14:19:12 UTC (rev 171000)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that semi-transparent layers with compositing parent on subpixel position get clipped properly. Non-retina test only.</title>
+<style>
+ div {
+ position:fixed;
+ width: 10px;
+ height: 10px;
+ }
+
+ img {
+ opacity: 0.9;
+ position: absolute;
+ left: 1px;
+ top: 1px;
+ width: 5px;
+ height: 5px;
+ }
+</style>
+</head>
+<body>
+<p id="container"></p>
+<script>
+ var container = document.getElementById("container");
+ var adjustment = 0;
+ for (i = 0; i < 20; ++i) {
+ for (j = 0; j < 20; ++j) {
+ var d = document.createElement("div");
+ d.style.top = (20 * i) + adjustment + "px";
+ d.style.left = (20 * j) + adjustment + "px";
+
+ var e = document.createElement("img");
+ e.src = "broken.jpg";
+ d.appendChild(e);
+
+ container.appendChild(d);
+
+ adjustment += 0.1;
+ }
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170999 => 171000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-11 12:26:08 UTC (rev 170999)
+++ trunk/Source/WebCore/ChangeLog 2014-07-11 14:19:12 UTC (rev 171000)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-07-11 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: icloud.com password arrow has clipped circle at some window sizes.
+ https://bugs.webkit.org/show_bug.cgi?id=134824
+ <rdar://problem/17612729>
+
+ Reviewed by Simon Fraser.
+
+ Transparent layer clipping needs device pixel offset adjusting.
+
+ Test: fast/layers/wrong-clipping-semi-transparent-compositing-layer-on-subpixel-position.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::beginTransparencyLayers):
+ (WebCore::RenderLayer::paintLayer):
+ (WebCore::RenderLayer::paintLayerContents):
+ (WebCore::RenderLayer::paintBackgroundForFragments):
+ (WebCore::RenderLayer::paintForegroundForFragments):
+ * rendering/RenderLayer.h:
+
</ins><span class="cx"> 2014-07-11 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Remove unused file.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (170999 => 171000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-07-11 12:26:08 UTC (rev 170999)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-07-11 14:19:12 UTC (rev 171000)
</span><span class="lines">@@ -1655,19 +1655,21 @@
</span><span class="cx"> return intersection(transparencyClipBox(currentLayer, rootLayer, PaintingTransparencyClipBox, RootOfTransparencyClipBox, paintBehavior), paintDirtyRect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayer::beginTransparencyLayers(GraphicsContext* context, const RenderLayer* rootLayer, const LayoutRect& paintDirtyRect, PaintBehavior paintBehavior)
</del><ins>+void RenderLayer::beginTransparencyLayers(GraphicsContext* context, const LayerPaintingInfo& paintingInfo, const LayoutRect& dirtyRect)
</ins><span class="cx"> {
</span><del>- if (context->paintingDisabled() || (paintsWithTransparency(paintBehavior) && m_usedTransparency))
</del><ins>+ if (context->paintingDisabled() || (paintsWithTransparency(paintingInfo.paintBehavior) && m_usedTransparency))
</ins><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> RenderLayer* ancestor = transparentPaintingAncestor();
</span><span class="cx"> if (ancestor)
</span><del>- ancestor->beginTransparencyLayers(context, rootLayer, paintDirtyRect, paintBehavior);
</del><ins>+ ancestor->beginTransparencyLayers(context, paintingInfo, dirtyRect);
</ins><span class="cx">
</span><del>- if (paintsWithTransparency(paintBehavior)) {
</del><ins>+ if (paintsWithTransparency(paintingInfo.paintBehavior)) {
</ins><span class="cx"> m_usedTransparency = true;
</span><span class="cx"> context->save();
</span><del>- FloatRect pixelSnappedClipRect = pixelSnappedForPainting(paintingExtent(*this, rootLayer, paintDirtyRect, paintBehavior), renderer().document().deviceScaleFactor());
</del><ins>+ LayoutRect adjustedClipRect = paintingExtent(*this, paintingInfo.rootLayer, dirtyRect, paintingInfo.paintBehavior);
+ adjustedClipRect.move(paintingInfo.subPixelAccumulation);
+ FloatRect pixelSnappedClipRect = pixelSnappedForPainting(adjustedClipRect, renderer().document().deviceScaleFactor());
</ins><span class="cx"> context->clip(pixelSnappedClipRect);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="lines">@@ -3693,9 +3695,9 @@
</span><span class="cx"> // layer from the parent now, assuming there is a parent
</span><span class="cx"> if (paintFlags & PaintLayerHaveTransparency) {
</span><span class="cx"> if (parent())
</span><del>- parent()->beginTransparencyLayers(context, paintingInfo.rootLayer, paintingInfo.paintDirtyRect, paintingInfo.paintBehavior);
</del><ins>+ parent()->beginTransparencyLayers(context, paintingInfo, paintingInfo.paintDirtyRect);
</ins><span class="cx"> else
</span><del>- beginTransparencyLayers(context, paintingInfo.rootLayer, paintingInfo.paintDirtyRect, paintingInfo.paintBehavior);
</del><ins>+ beginTransparencyLayers(context, paintingInfo, paintingInfo.paintDirtyRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (enclosingPaginationLayer(ExcludeCompositedPaginatedLayers)) {
</span><span class="lines">@@ -4003,7 +4005,7 @@
</span><span class="cx"> context = filterPainter->filterContext();
</span><span class="cx"> if (context != transparencyLayerContext && haveTransparency) {
</span><span class="cx"> // If we have a filter and transparency, we have to eagerly start a transparency layer here, rather than risk a child layer lazily starts one with the wrong context.
</span><del>- beginTransparencyLayers(transparencyLayerContext, localPaintingInfo.rootLayer, paintingInfo.paintDirtyRect, localPaintingInfo.paintBehavior);
</del><ins>+ beginTransparencyLayers(transparencyLayerContext, localPaintingInfo, paintingInfo.paintDirtyRect);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -4380,7 +4382,7 @@
</span><span class="cx">
</span><span class="cx"> // Begin transparency layers lazily now that we know we have to paint something.
</span><span class="cx"> if (haveTransparency)
</span><del>- beginTransparencyLayers(transparencyLayerContext, localPaintingInfo.rootLayer, transparencyPaintDirtyRect, localPaintingInfo.paintBehavior);
</del><ins>+ beginTransparencyLayers(transparencyLayerContext, localPaintingInfo, transparencyPaintDirtyRect);
</ins><span class="cx">
</span><span class="cx"> if (localPaintingInfo.clipToDirtyRect) {
</span><span class="cx"> // Paint our background first, before painting any child layers.
</span><span class="lines">@@ -4407,7 +4409,7 @@
</span><span class="cx"> for (size_t i = 0; i < layerFragments.size(); ++i) {
</span><span class="cx"> const LayerFragment& fragment = layerFragments.at(i);
</span><span class="cx"> if (fragment.shouldPaintContent && !fragment.foregroundRect.isEmpty()) {
</span><del>- beginTransparencyLayers(transparencyLayerContext, localPaintingInfo.rootLayer, transparencyPaintDirtyRect, localPaintingInfo.paintBehavior);
</del><ins>+ beginTransparencyLayers(transparencyLayerContext, localPaintingInfo, transparencyPaintDirtyRect);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (170999 => 171000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2014-07-11 12:26:08 UTC (rev 170999)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2014-07-11 14:19:12 UTC (rev 171000)
</span><span class="lines">@@ -377,8 +377,6 @@
</span><span class="cx"> bool cannotBlitToWindow() const;
</span><span class="cx">
</span><span class="cx"> bool isTransparent() const { return renderer().isTransparent() || renderer().hasMask(); }
</span><del>- RenderLayer* transparentPaintingAncestor();
- void beginTransparencyLayers(GraphicsContext*, const RenderLayer* rootLayer, const LayoutRect& paintDirtyRect, PaintBehavior);
</del><span class="cx">
</span><span class="cx"> bool hasReflection() const { return renderer().hasReflection(); }
</span><span class="cx"> bool isReflection() const { return renderer().isReplica(); }
</span><span class="lines">@@ -1012,6 +1010,9 @@
</span><span class="cx"> void paintMaskForFragments(const LayerFragments&, GraphicsContext*, const LayerPaintingInfo&, RenderObject* paintingRootForRenderer);
</span><span class="cx"> void paintTransformedLayerIntoFragments(GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags);
</span><span class="cx">
</span><ins>+ RenderLayer* transparentPaintingAncestor();
+ void beginTransparencyLayers(GraphicsContext*, const LayerPaintingInfo&, const LayoutRect& dirtyRect);
+
</ins><span class="cx"> RenderLayer* hitTestLayer(RenderLayer* rootLayer, RenderLayer* containerLayer, const HitTestRequest& request, HitTestResult& result,
</span><span class="cx"> const LayoutRect& hitTestRect, const HitTestLocation&, bool appliedTransform,
</span><span class="cx"> const HitTestingTransformState* = nullptr, double* zOffset = nullptr);
</span></span></pre>
</div>
</div>
</body>
</html>