<!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>[211305] 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/211305">211305</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-01-27 15:16:17 -0800 (Fri, 27 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Element with a backdrop-filter and a mask may not correctly mask the backdrop
https://bugs.webkit.org/show_bug.cgi?id=167456
rdar://problem/29320059
Reviewed by Antoine Quint.
Source/WebCore:
If a layer had a backdrop filter, but also corner radii that triggered using a mask layer,
then the call to updateClippingStrategy() in GraphicsLayerCA::updateBackdropFiltersRect() would
set the backdrop layer's mask, but GraphicsLayerCA::updateMaskLayer() would promptly then set
the mask layer back to nil.
Fix by having GraphicsLayerCA::updateMaskLayer() put the mask on the structural layer, if there
is one. We always have a structural layer with backdrops, so this will mask both the layer
and the backdrop.
Test: css3/filters/backdrop/backdrop-filter-uneven-corner-radii.html
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::updateMaskLayer):
* platform/graphics/mac/WebLayer.mm:
(-[CALayer _descriptionWithPrefix:]): Dump the mask layer.
LayoutTests:
* css3/filters/backdrop/backdrop-filter-uneven-corner-radii-expected.html: Added.
* css3/filters/backdrop/backdrop-filter-uneven-corner-radii.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="#trunkSourceWebCoreplatformgraphicsmacWebLayermm">trunk/Source/WebCore/platform/graphics/mac/WebLayer.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3filtersbackdropbackdropfilterunevencornerradiiexpectedhtml">trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-uneven-corner-radii-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3filtersbackdropbackdropfilterunevencornerradiihtml">trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-uneven-corner-radii.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211304 => 211305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-27 23:11:17 UTC (rev 211304)
+++ trunk/LayoutTests/ChangeLog 2017-01-27 23:16:17 UTC (rev 211305)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-01-27 Simon Fraser <simon.fraser@apple.com>
+
+ Element with a backdrop-filter and a mask may not correctly mask the backdrop
+ https://bugs.webkit.org/show_bug.cgi?id=167456
+ rdar://problem/29320059
+
+ Reviewed by Antoine Quint.
+
+ * css3/filters/backdrop/backdrop-filter-uneven-corner-radii-expected.html: Added.
+ * css3/filters/backdrop/backdrop-filter-uneven-corner-radii.html: Added.
+
</ins><span class="cx"> 2017-01-27 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> media/track/track-in-band-style.html is flaky
</span></span></pre></div>
<a id="trunkLayoutTestscss3filtersbackdropbackdropfilterunevencornerradiiexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-uneven-corner-radii-expected.html (0 => 211305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-uneven-corner-radii-expected.html (rev 0)
+++ trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-uneven-corner-radii-expected.html 2017-01-27 23:16:17 UTC (rev 211305)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+.container {
+ position: absolute;
+ top: 10px;
+ left: 10px;
+ width: 225px;
+ height: 225px;
+ background-image: repeating-linear-gradient(rgba(0, 0, 0, 0.25), rgba(0, 0, 0, 0.25) 25px, transparent 25px, transparent 50px),
+ repeating-linear-gradient(to right, rgba(0, 0, 0, 0.25), rgba(0, 0, 0, 0.25) 25px, transparent 25px, transparent 50px);
+}
+
+.container > div {
+ position: absolute;
+ left: calc((100% - 160px)/2);
+ top: calc((100% - 160px)/2);
+ width: 160px;
+ height: 160px;
+ background-color: rgba(0, 0, 128, 0.2);
+}
+
+.cover {
+ position: absolute;
+ width: 145px;
+ height: 145px;
+ background-color: gray;
+}
+</style>
+
+</head>
+<body>
+ <div class="container">
+ <div style="border-top-left-radius: 100%"></div>
+ </div>
+
+ <div class="cover" style="top: 90px; width: 225px;"></div>
+ <div class="cover" style="left: 90px; height: 225px;"></div>
+
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3filtersbackdropbackdropfilterunevencornerradiihtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-uneven-corner-radii.html (0 => 211305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-uneven-corner-radii.html (rev 0)
+++ trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-uneven-corner-radii.html 2017-01-27 23:16:17 UTC (rev 211305)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+.container {
+ position: absolute;
+ top: 10px;
+ left: 10px;
+ width: 225px;
+ height: 225px;
+ background-image: repeating-linear-gradient(rgba(0, 0, 0, 0.25), rgba(0, 0, 0, 0.25) 25px, transparent 25px, transparent 50px),
+ repeating-linear-gradient(to right, rgba(0, 0, 0, 0.25), rgba(0, 0, 0, 0.25) 25px, transparent 25px, transparent 50px);
+}
+
+.container > div {
+ position: absolute;
+ left: calc((100% - 160px)/2);
+ top: calc((100% - 160px)/2);
+ width: 160px;
+ height: 160px;
+ background-color: rgba(0, 0, 128, 0.2);
+ -webkit-backdrop-filter: blur(5px);
+}
+
+.cover {
+ position: absolute;
+ width: 145px;
+ height: 145px;
+ background-color: gray;
+}
+</style>
+
+</head>
+<body>
+ <div class="container">
+ <div style="border-top-left-radius: 100%"></div>
+ </div>
+
+ <div class="cover" style="top: 90px; width: 225px;"></div>
+ <div class="cover" style="left: 90px; height: 225px;"></div>
+
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211304 => 211305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-27 23:11:17 UTC (rev 211304)
+++ trunk/Source/WebCore/ChangeLog 2017-01-27 23:16:17 UTC (rev 211305)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2017-01-27 Simon Fraser <simon.fraser@apple.com>
+
+ Element with a backdrop-filter and a mask may not correctly mask the backdrop
+ https://bugs.webkit.org/show_bug.cgi?id=167456
+ rdar://problem/29320059
+
+ Reviewed by Antoine Quint.
+
+ If a layer had a backdrop filter, but also corner radii that triggered using a mask layer,
+ then the call to updateClippingStrategy() in GraphicsLayerCA::updateBackdropFiltersRect() would
+ set the backdrop layer's mask, but GraphicsLayerCA::updateMaskLayer() would promptly then set
+ the mask layer back to nil.
+
+ Fix by having GraphicsLayerCA::updateMaskLayer() put the mask on the structural layer, if there
+ is one. We always have a structural layer with backdrops, so this will mask both the layer
+ and the backdrop.
+
+ Test: css3/filters/backdrop/backdrop-filter-uneven-corner-radii.html
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::updateMaskLayer):
+ * platform/graphics/mac/WebLayer.mm:
+ (-[CALayer _descriptionWithPrefix:]): Dump the mask layer.
+
</ins><span class="cx"> 2017-01-27 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix remaining bad uses of logDiagnosticMessageWithValue()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (211304 => 211305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2017-01-27 23:11:17 UTC (rev 211304)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2017-01-27 23:16:17 UTC (rev 211305)
</span><span class="lines">@@ -2541,20 +2541,18 @@
</span><span class="cx"> void GraphicsLayerCA::updateMaskLayer()
</span><span class="cx"> {
</span><span class="cx"> PlatformCALayer* maskCALayer = m_maskLayer ? downcast<GraphicsLayerCA>(*m_maskLayer).primaryLayer() : nullptr;
</span><del>- m_layer->setMask(maskCALayer);
-
- if (m_backdropLayer) {
- if (m_maskLayer) {
- ReplicaState replicaState(ReplicaState::ChildBranch);
- RefPtr<PlatformCALayer> maskClone = downcast<GraphicsLayerCA>(*m_maskLayer).fetchCloneLayers(this, replicaState, IntermediateCloneLevel);
- m_backdropLayer->setMask(maskClone.get());
- } else
- m_backdropLayer->setMask(nullptr);
</del><ins>+
+ LayerMap* layerCloneMap;
+ if (m_structuralLayer) {
+ m_structuralLayer->setMask(maskCALayer);
+ layerCloneMap = m_structuralLayerClones.get();
+ } else {
+ m_layer->setMask(maskCALayer);
+ layerCloneMap = m_layerClones.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayerMap* maskLayerCloneMap = m_maskLayer ? downcast<GraphicsLayerCA>(*m_maskLayer).primaryLayerClones() : nullptr;
</span><del>-
- if (LayerMap* layerCloneMap = m_layerClones.get()) {
</del><ins>+ if (layerCloneMap) {
</ins><span class="cx"> for (auto& clone : *layerCloneMap) {
</span><span class="cx"> PlatformCALayer* maskClone = maskLayerCloneMap ? maskLayerCloneMap->get(clone.key) : nullptr;
</span><span class="cx"> clone.value->setMask(maskClone);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacWebLayermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/WebLayer.mm (211304 => 211305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/WebLayer.mm 2017-01-27 23:11:17 UTC (rev 211304)
+++ trunk/Source/WebCore/platform/graphics/mac/WebLayer.mm 2017-01-27 23:16:17 UTC (rev 211305)
</span><span class="lines">@@ -168,6 +168,11 @@
</span><span class="cx"> if ([[self sublayers] count] == 0)
</span><span class="cx"> [curDesc appendString:@"\n"];
</span><span class="cx">
</span><ins>+ if (CALayer *mask = [self mask]) {
+ [curDesc appendString:@"mask: "];
+ [curDesc appendString:[mask _descriptionWithPrefix:sublayerPrefix]];
+ }
+
</ins><span class="cx"> return curDesc;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>