<!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>[185192] 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/185192">185192</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-06-03 23:23:47 -0700 (Wed, 03 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use borderBoxRect instead of contentBoxRect for backdrop filter.
https://bugs.webkit.org/show_bug.cgi?id=145606
Reviewed by Simon Fraser.
Backdrop filter should use border box rect. It also needs to take css clip into account.
Source/WebCore:
Tests: css3/filters/backdrop/backdrop-filter-with-cliprect.html
css3/filters/backdrop/backdrop-filter-with-mask.html
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateBackdropFiltersGeometry):
LayoutTests:
* css3/filters/backdrop/backdrop-filter-does-not-size-properly-border-and-padding-expected.txt:
* css3/filters/backdrop/backdrop-filter-with-cliprect-expected.txt: Added.
* css3/filters/backdrop/backdrop-filter-with-cliprect.html: Added.
* css3/filters/backdrop/backdrop-filter-with-mask-expected.txt: Added.
* css3/filters/backdrop/backdrop-filter-with-mask.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3filtersbackdropbackdropfilterdoesnotsizeproperlyborderandpaddingexpectedtxt">trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-does-not-size-properly-border-and-padding-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3filtersbackdropbackdropfilterwithcliprectexpectedtxt">trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-with-cliprect-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3filtersbackdropbackdropfilterwithcliprecthtml">trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-with-cliprect.html</a></li>
<li><a href="#trunkLayoutTestscss3filtersbackdropbackdropfilterwithmaskexpectedtxt">trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-with-mask-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3filtersbackdropbackdropfilterwithmaskhtml">trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-with-mask.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185191 => 185192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-04 06:06:50 UTC (rev 185191)
+++ trunk/LayoutTests/ChangeLog 2015-06-04 06:23:47 UTC (rev 185192)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-06-03 Zalan Bujtas <zalan@apple.com>
+
+ Use borderBoxRect instead of contentBoxRect for backdrop filter.
+ https://bugs.webkit.org/show_bug.cgi?id=145606
+
+ Reviewed by Simon Fraser.
+
+ Backdrop filter should use border box rect. It also needs to take css clip into account.
+
+ * css3/filters/backdrop/backdrop-filter-does-not-size-properly-border-and-padding-expected.txt:
+ * css3/filters/backdrop/backdrop-filter-with-cliprect-expected.txt: Added.
+ * css3/filters/backdrop/backdrop-filter-with-cliprect.html: Added.
+ * css3/filters/backdrop/backdrop-filter-with-mask-expected.txt: Added.
+ * css3/filters/backdrop/backdrop-filter-with-mask.html: Added.
+
</ins><span class="cx"> 2015-06-03 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL] Unreviewed gardening on 4th June.
</span></span></pre></div>
<a id="trunkLayoutTestscss3filtersbackdropbackdropfilterdoesnotsizeproperlyborderandpaddingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-does-not-size-properly-border-and-padding-expected.txt (185191 => 185192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-does-not-size-properly-border-and-padding-expected.txt 2015-06-04 06:06:50 UTC (rev 185191)
+++ trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-does-not-size-properly-border-and-padding-expected.txt 2015-06-04 06:23:47 UTC (rev 185192)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> (bounds 180.00 280.00)
</span><span class="cx"> (drawsContent 1)
</span><span class="cx"> (structural layer 98.00, 148.00 180.00 x 280.00)
</span><del>- (backdrop layer 40.00, 40.00 100.00 x 200.00)
</del><ins>+ (backdrop layer 0.00, 0.00 180.00 x 280.00)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkLayoutTestscss3filtersbackdropbackdropfilterwithcliprectexpectedtxtfromrev185191trunkLayoutTestscss3filtersbackdropbackdropfilterdoesnotsizeproperlyborderandpaddingexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-with-cliprect-expected.txt (from rev 185191, trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-does-not-size-properly-border-and-padding-expected.txt) (0 => 185192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-with-cliprect-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-with-cliprect-expected.txt 2015-06-04 06:23:47 UTC (rev 185192)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+foo
+bar
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 600.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (contentsOpaque 1)
+ (children 1
+ (GraphicsLayer
+ (position 8.00 26.00)
+ (bounds 120.00 120.00)
+ (drawsContent 1)
+ (structural layer 68.00, 86.00 120.00 x 120.00)
+ (backdrop layer 0.00, 0.00 120.00 x 120.00)
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3filtersbackdropbackdropfilterwithcliprecthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-with-cliprect.html (0 => 185192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-with-cliprect.html (rev 0)
+++ trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-with-cliprect.html 2015-06-04 06:23:47 UTC (rev 185192)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that backdrop filter is clipped properly.</title>
+<style>
+.container {
+ background-color: red;
+ color: black;
+ width: 200px;
+ height: 200px;
+}
+.inner {
+ -webkit-backdrop-filter: invert(1);
+ clip: rect(5px, 115px, 115px, 5px);
+ border: 10px solid green;
+ width: 100px;
+ height: 100px;
+}
+</style>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ function dumpLayers() {
+ if (window.internals)
+ document.getElementById('result').innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_CONTENT_LAYERS)
+ }
+ window.addEventListener('load', dumpLayers, false);
+</script>
+</head>
+<body>
+<div class=container>foo<div class=inner>bar</div></div>
+<pre id=result></pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3filtersbackdropbackdropfilterwithmaskexpectedtxtfromrev185191trunkLayoutTestscss3filtersbackdropbackdropfilterdoesnotsizeproperlyborderandpaddingexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-with-mask-expected.txt (from rev 185191, trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-does-not-size-properly-border-and-padding-expected.txt) (0 => 185192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-with-mask-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-with-mask-expected.txt 2015-06-04 06:23:47 UTC (rev 185192)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+foo
+bar
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 600.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (contentsOpaque 1)
+ (children 1
+ (GraphicsLayer
+ (position 8.00 26.00)
+ (bounds 120.00 120.00)
+ (drawsContent 1)
+ (structural layer 68.00, 86.00 120.00 x 120.00)
+ (backdrop layer 0.00, 0.00 120.00 x 120.00)
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3filtersbackdropbackdropfilterwithmaskhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-with-mask.html (0 => 185192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-with-mask.html (rev 0)
+++ trunk/LayoutTests/css3/filters/backdrop/backdrop-filter-with-mask.html 2015-06-04 06:23:47 UTC (rev 185192)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that backdrop filter with mask works properly.</title>
+<style>
+.container {
+ width: 200px;
+ height: 200px;
+}
+.inner {
+ -webkit-backdrop-filter: invert(1);
+ border: 10px solid green;
+ width: 100px;
+ height: 100px;
+ -webkit-mask-image: linear-gradient(black, transparent);
+}
+</style>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ function dumpLayers() {
+ if (window.internals)
+ document.getElementById('result').innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_CONTENT_LAYERS)
+ }
+ window.addEventListener('load', dumpLayers, false);
+</script>
+</head>
+<body>
+<div class=container>foo<div class=inner>bar</div></div>
+<pre id=result></pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185191 => 185192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-04 06:06:50 UTC (rev 185191)
+++ trunk/Source/WebCore/ChangeLog 2015-06-04 06:23:47 UTC (rev 185192)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-06-03 Zalan Bujtas <zalan@apple.com>
+
+ Use borderBoxRect instead of contentBoxRect for backdrop filter.
+ https://bugs.webkit.org/show_bug.cgi?id=145606
+
+ Reviewed by Simon Fraser.
+
+ Backdrop filter should use border box rect. It also needs to take css clip into account.
+
+ Tests: css3/filters/backdrop/backdrop-filter-with-cliprect.html
+ css3/filters/backdrop/backdrop-filter-with-mask.html
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateBackdropFiltersGeometry):
+
</ins><span class="cx"> 2015-06-03 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> MediaDevices.getUserMedia should put promises in resolve/reject state synchronously
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (185191 => 185192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-06-04 06:06:50 UTC (rev 185191)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-06-04 06:23:47 UTC (rev 185192)
</span><span class="lines">@@ -395,7 +395,17 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_canCompositeBackdropFilters)
</span><span class="cx"> return;
</span><del>- m_graphicsLayer->setBackdropFiltersRect(snapRectToDevicePixels(contentsBox(), deviceScaleFactor()));
</del><ins>+
+ if (!is<RenderBox>(renderer()))
+ return;
+
+ RenderBox& renderer = downcast<RenderBox>(this->renderer());
+ LayoutRect backdropFiltersRect = renderer.borderBoxRect();
+ if (renderer.hasClip())
+ backdropFiltersRect.intersect(renderer.clipRect(LayoutPoint(), nullptr));
+
+ backdropFiltersRect.move(contentOffsetInCompostingLayer());
+ m_graphicsLayer->setBackdropFiltersRect(snapRectToDevicePixels(backdropFiltersRect, deviceScaleFactor()));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>