<!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>[185343] 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/185343">185343</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-06-08 17:29:13 -0700 (Mon, 08 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel rendering: Clip-path does not work properly on subpixel positions.
https://bugs.webkit.org/show_bug.cgi?id=145749
rdar://problem/20824305
Reviewed by Simon Fraser.
This patch ensures that clip-path is device pixel snapped both for composited and
non-composited content.
Source/WebCore:
Tests: compositing/masks/compositing-clip-path-on-subpixel-position.html
fast/masking/clip-path-on-subpixel-position.html
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::setupClipPath):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateMaskingLayerGeometry):
LayoutTests:
* compositing/masks/compositing-clip-path-on-subpixel-position-expected.html: Added.
* compositing/masks/compositing-clip-path-on-subpixel-position.html: Added.
* fast/masking/clip-path-on-subpixel-position-expected.html: Added.
* fast/masking/clip-path-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="#trunkSourceWebCorerenderingClipPathOperationh">trunk/Source/WebCore/rendering/ClipPathOperation.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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositingmaskscompositingclippathonsubpixelpositionexpectedhtml">trunk/LayoutTests/compositing/masks/compositing-clip-path-on-subpixel-position-expected.html</a></li>
<li><a href="#trunkLayoutTestscompositingmaskscompositingclippathonsubpixelpositionhtml">trunk/LayoutTests/compositing/masks/compositing-clip-path-on-subpixel-position.html</a></li>
<li><a href="#trunkLayoutTestsfastmaskingclippathonsubpixelpositionexpectedhtml">trunk/LayoutTests/fast/masking/clip-path-on-subpixel-position-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmaskingclippathonsubpixelpositionhtml">trunk/LayoutTests/fast/masking/clip-path-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 (185342 => 185343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-09 00:28:19 UTC (rev 185342)
+++ trunk/LayoutTests/ChangeLog 2015-06-09 00:29:13 UTC (rev 185343)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-06-08 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Clip-path does not work properly on subpixel positions.
+ https://bugs.webkit.org/show_bug.cgi?id=145749
+ rdar://problem/20824305
+
+ Reviewed by Simon Fraser.
+
+ This patch ensures that clip-path is device pixel snapped both for composited and
+ non-composited content.
+
+ * compositing/masks/compositing-clip-path-on-subpixel-position-expected.html: Added.
+ * compositing/masks/compositing-clip-path-on-subpixel-position.html: Added.
+ * fast/masking/clip-path-on-subpixel-position-expected.html: Added.
+ * fast/masking/clip-path-on-subpixel-position.html: Added.
+
</ins><span class="cx"> 2015-06-08 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Mouse release on AutoFill button activates it; should only activate on click
</span></span></pre></div>
<a id="trunkLayoutTestscompositingmaskscompositingclippathonsubpixelpositionexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/masks/compositing-clip-path-on-subpixel-position-expected.html (0 => 185343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/masks/compositing-clip-path-on-subpixel-position-expected.html (rev 0)
+++ trunk/LayoutTests/compositing/masks/compositing-clip-path-on-subpixel-position-expected.html 2015-06-09 00:29:13 UTC (rev 185343)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests proper clip-path masking when content is on subpixel position and the parent is composited too.</title>
+<style>
+ .clip-path-content {
+ transform: translateZ(0);
+ position: relative;
+ left: 1px;
+ top: 0px;
+ height: 50px;
+ width: 100px;
+ background-color: black;
+ -webkit-clip-path: inset(20px 0px 0px 0px);
+ }
+</style>
+</head>
+<body>
+<div class=clip-path-content></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingmaskscompositingclippathonsubpixelpositionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/masks/compositing-clip-path-on-subpixel-position.html (0 => 185343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/masks/compositing-clip-path-on-subpixel-position.html (rev 0)
+++ trunk/LayoutTests/compositing/masks/compositing-clip-path-on-subpixel-position.html 2015-06-09 00:29:13 UTC (rev 185343)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests proper clip-path masking when content is on subpixel position and the parent is composited too.</title>
+<style>
+ .clip-path-content {
+ transform: translateZ(0);
+ position: relative;
+ left: 0.5px;
+ top: 0px;
+ height: 50px;
+ width: 100px;
+ background-color: black;
+ -webkit-clip-path: inset(20px 0px 0px 0px);
+ }
+</style>
+</head>
+<body>
+<div class=clip-path-content></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmaskingclippathonsubpixelpositionexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/masking/clip-path-on-subpixel-position-expected.html (0 => 185343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/masking/clip-path-on-subpixel-position-expected.html (rev 0)
+++ trunk/LayoutTests/fast/masking/clip-path-on-subpixel-position-expected.html 2015-06-09 00:29:13 UTC (rev 185343)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests proper clip-path masking when content is on subpixel position.</title>
+<style>
+ .clip-path-content {
+ position: relative;
+ left: 1px;
+ top: 0px;
+ height: 50px;
+ width: 100px;
+ background-color: black;
+ -webkit-clip-path: inset(20px 0px 0px 0px);
+ }
+</style>
+</head>
+<body>
+<div class=clip-path-content></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmaskingclippathonsubpixelpositionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/masking/clip-path-on-subpixel-position.html (0 => 185343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/masking/clip-path-on-subpixel-position.html (rev 0)
+++ trunk/LayoutTests/fast/masking/clip-path-on-subpixel-position.html 2015-06-09 00:29:13 UTC (rev 185343)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests proper clip-path masking when content is on subpixel position.</title>
+<style>
+ .clip-path-content {
+ position: relative;
+ left: 0.5px;
+ top: 0px;
+ height: 50px;
+ width: 100px;
+ background-color: black;
+ -webkit-clip-path: inset(20px 0px 0px 0px);
+ }
+</style>
+</head>
+<body>
+<div class=clip-path-content></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185342 => 185343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-09 00:28:19 UTC (rev 185342)
+++ trunk/Source/WebCore/ChangeLog 2015-06-09 00:29:13 UTC (rev 185343)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-06-08 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Clip-path does not work properly on subpixel positions.
+ https://bugs.webkit.org/show_bug.cgi?id=145749
+ rdar://problem/20824305
+
+ Reviewed by Simon Fraser.
+
+ This patch ensures that clip-path is device pixel snapped both for composited and
+ non-composited content.
+
+ Tests: compositing/masks/compositing-clip-path-on-subpixel-position.html
+ fast/masking/clip-path-on-subpixel-position.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::setupClipPath):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateMaskingLayerGeometry):
+
</ins><span class="cx"> 2015-06-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Access GCController instance via GCController::singleton() instead of a free function
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingClipPathOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/ClipPathOperation.h (185342 => 185343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/ClipPathOperation.h 2015-06-09 00:28:19 UTC (rev 185342)
+++ trunk/Source/WebCore/rendering/ClipPathOperation.h 2015-06-09 00:29:13 UTC (rev 185343)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> return adoptRef(*new BoxClipPathOperation(referenceBox));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const Path pathForReferenceRect(const RoundedRect& boundingRect) const
</del><ins>+ const Path pathForReferenceRect(const FloatRoundedRect& boundingRect) const
</ins><span class="cx"> {
</span><span class="cx"> Path path;
</span><span class="cx"> path.addRoundedRect(boundingRect);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (185342 => 185343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-06-09 00:28:19 UTC (rev 185342)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-06-09 00:29:13 UTC (rev 185343)
</span><span class="lines">@@ -4046,10 +4046,11 @@
</span><span class="cx"> Path RenderLayer::computeClipPath(const LayoutSize& offsetFromRoot, LayoutRect& rootRelativeBounds, WindRule& windRule) const
</span><span class="cx"> {
</span><span class="cx"> const RenderStyle& style = renderer().style();
</span><ins>+ float deviceSaleFactor = renderer().document().deviceScaleFactor();
</ins><span class="cx">
</span><span class="cx"> if (is<ShapeClipPathOperation>(*style.clipPath())) {
</span><span class="cx"> auto& clipPath = downcast<ShapeClipPathOperation>(*style.clipPath());
</span><del>- LayoutRect referenceBox = computeReferenceBox(renderer(), clipPath, offsetFromRoot, rootRelativeBounds);
</del><ins>+ FloatRect referenceBox = snapRectToDevicePixels(computeReferenceBox(renderer(), clipPath, offsetFromRoot, rootRelativeBounds), deviceSaleFactor);
</ins><span class="cx">
</span><span class="cx"> windRule = clipPath.windRule();
</span><span class="cx"> return clipPath.pathForReferenceRect(referenceBox);
</span><span class="lines">@@ -4059,7 +4060,7 @@
</span><span class="cx">
</span><span class="cx"> auto& clipPath = downcast<BoxClipPathOperation>(*style.clipPath());
</span><span class="cx">
</span><del>- RoundedRect shapeRect = computeRoundedRectForBoxShape(clipPath.referenceBox(), downcast<RenderBox>(renderer()));
</del><ins>+ FloatRoundedRect shapeRect = computeRoundedRectForBoxShape(clipPath.referenceBox(), downcast<RenderBox>(renderer())).pixelSnappedRoundedRectForPainting(deviceSaleFactor);
</ins><span class="cx"> shapeRect.move(offsetFromRoot);
</span><span class="cx">
</span><span class="cx"> windRule = RULE_NONZERO;
</span><span class="lines">@@ -4083,7 +4084,8 @@
</span><span class="cx"> ASSERT(style.clipPath());
</span><span class="cx"> if (is<ShapeClipPathOperation>(*style.clipPath()) || (is<BoxClipPathOperation>(*style.clipPath()) && is<RenderBox>(renderer()))) {
</span><span class="cx"> WindRule windRule;
</span><del>- Path path = computeClipPath(offsetFromRoot, rootRelativeBounds, windRule);
</del><ins>+ LayoutSize paintingOffsetFromRoot = LayoutSize(snapSizeToDevicePixel(offsetFromRoot + paintingInfo.subpixelAccumulation, LayoutPoint(), renderer().document().deviceScaleFactor()));
+ Path path = computeClipPath(paintingOffsetFromRoot, rootRelativeBounds, windRule);
</ins><span class="cx"> context->save();
</span><span class="cx"> context->clipPath(path, windRule);
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (185342 => 185343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-06-09 00:28:19 UTC (rev 185342)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-06-09 00:29:13 UTC (rev 185343)
</span><span class="lines">@@ -1056,8 +1056,10 @@
</span><span class="cx">
</span><span class="cx"> WindRule windRule;
</span><span class="cx"> // FIXME: Use correct reference box for inlines: https://bugs.webkit.org/show_bug.cgi?id=129047
</span><del>- LayoutRect referenceBoxForClippedInline = m_owningLayer.boundingBox(&m_owningLayer);
- Path clipPath = m_owningLayer.computeClipPath(LayoutSize(), referenceBoxForClippedInline, windRule);
</del><ins>+ LayoutRect boundingBox = m_owningLayer.boundingBox(&m_owningLayer);
+ LayoutRect referenceBoxForClippedInline = LayoutRect(snapRectToDevicePixels(boundingBox, deviceScaleFactor()));
+ LayoutSize offset = LayoutSize(snapSizeToDevicePixel(m_devicePixelFractionFromRenderer, LayoutPoint(), deviceScaleFactor()));
+ Path clipPath = m_owningLayer.computeClipPath(offset, referenceBoxForClippedInline, windRule);
</ins><span class="cx">
</span><span class="cx"> m_maskLayer->setShapeLayerPath(clipPath);
</span><span class="cx"> m_maskLayer->setShapeLayerWindRule(windRule);
</span></span></pre>
</div>
</div>
</body>
</html>