<!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>[207722] 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/207722">207722</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-10-22 19:43:48 -0700 (Sat, 22 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Backdrop filter doesn't show if removed then re-added
https://bugs.webkit.org/show_bug.cgi?id=163860
Reviewed by Dan Bernstein.
Source/WebCore:
When a backdrop filter is removed the re-added, updateBackdropFiltersRect() never
runs the second time because m_backdropFiltersRect doesn't change. However, we need
to run that code to size and position the newly re-created backdrop layer, so run
it explicitly if we just created the backdrop layer. This is similar to how
updateContentsImage() calls updateContentsRects().
Test: css3/filters/backdrop/add-remove-add-backdrop-filter.html
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::setBackdropFilters):
(WebCore::GraphicsLayerCA::updateBackdropFilters):
LayoutTests:
* css3/filters/backdrop/add-remove-add-backdrop-filter-expected.html: Added.
* css3/filters/backdrop/add-remove-add-backdrop-filter.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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3filtersbackdropaddremoveaddbackdropfilterexpectedhtml">trunk/LayoutTests/css3/filters/backdrop/add-remove-add-backdrop-filter-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3filtersbackdropaddremoveaddbackdropfilterhtml">trunk/LayoutTests/css3/filters/backdrop/add-remove-add-backdrop-filter.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207721 => 207722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-23 02:43:42 UTC (rev 207721)
+++ trunk/LayoutTests/ChangeLog 2016-10-23 02:43:48 UTC (rev 207722)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2016-10-22 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Backdrop filter doesn't show if removed then re-added
+ https://bugs.webkit.org/show_bug.cgi?id=163860
+
+ Reviewed by Dan Bernstein.
+
+ * css3/filters/backdrop/add-remove-add-backdrop-filter-expected.html: Added.
+ * css3/filters/backdrop/add-remove-add-backdrop-filter.html: Added.
+
+2016-10-22 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Fix repainting of slow repaint objects in WK1 when page scale is applied
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163854
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestscss3filtersbackdropaddremoveaddbackdropfilterexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/filters/backdrop/add-remove-add-backdrop-filter-expected.html (0 => 207722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/backdrop/add-remove-add-backdrop-filter-expected.html (rev 0)
+++ trunk/LayoutTests/css3/filters/backdrop/add-remove-add-backdrop-filter-expected.html 2016-10-23 02:43:48 UTC (rev 207722)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <meta name="viewport" content="width=device-width">
+ <title>This tests that backdrop filter shows correctly when removed and re-added.</title>
+ <style>
+ #text {
+ position: absolute;
+ width: 200px;
+ height: 200px;
+ overflow: hidden;
+ }
+ #blur {
+ position: absolute;
+ left: 50px;
+ top: 50px;
+ width: 100px;
+ height: 100px;
+ will-change: transform;
+ background-color: rgba(255, 0, 0, 0.5);
+ -webkit-backdrop-filter: blur(5px);
+ }
+ </style>
+</head>
+<body>
+<div id="text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum a nunc ultrices, faucibus ligula ac, euismod elit. Ut in vehicula enim. Suspendisse sodales auctor nunc, sit amet vehicula velit cursus vulputate. Nunc sed ipsum vitae massa dapibus sodales sit amet quis dui. Aenean sit amet interdum arcu, et facilisis diam. Ut a lacus eleifend, feugiat tellus vel, molestie lorem. Nulla pulvinar dapibus semper. Quisque mollis, neque non luctus aliquam, ex risus lacinia augue, vel eleifend augue erat eget ante.
+</div>
+<div id="blur"></div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3filtersbackdropaddremoveaddbackdropfilterhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/filters/backdrop/add-remove-add-backdrop-filter.html (0 => 207722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/backdrop/add-remove-add-backdrop-filter.html (rev 0)
+++ trunk/LayoutTests/css3/filters/backdrop/add-remove-add-backdrop-filter.html 2016-10-23 02:43:48 UTC (rev 207722)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <meta name="viewport" content="width=device-width">
+ <title>This tests that backdrop filter shows correctly when removed and re-added.</title>
+ <style>
+ #text {
+ position: absolute;
+ width: 200px;
+ height: 200px;
+ overflow: hidden;
+ }
+ #blur {
+ position: absolute;
+ left: 50px;
+ top: 50px;
+ width: 100px;
+ height: 100px;
+ will-change: transform;
+ background-color: rgba(255, 0, 0, 0.5);
+ }
+
+ #blur.blurry {
+ -webkit-backdrop-filter: blur(5px);
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+
+ function doTest()
+ {
+ var backdrop = document.getElementById('blur');
+ backdrop.classList.add('blurry');
+ window.setTimeout(function() {
+ backdrop.classList.remove('blurry');
+ window.setTimeout(function() {
+ backdrop.classList.add('blurry');
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0)
+ }, 0)
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+<div id="text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum a nunc ultrices, faucibus ligula ac, euismod elit. Ut in vehicula enim. Suspendisse sodales auctor nunc, sit amet vehicula velit cursus vulputate. Nunc sed ipsum vitae massa dapibus sodales sit amet quis dui. Aenean sit amet interdum arcu, et facilisis diam. Ut a lacus eleifend, feugiat tellus vel, molestie lorem. Nulla pulvinar dapibus semper. Quisque mollis, neque non luctus aliquam, ex risus lacinia augue, vel eleifend augue erat eget ante.
+</div>
+<div id="blur"></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 (207721 => 207722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-23 02:43:42 UTC (rev 207721)
+++ trunk/Source/WebCore/ChangeLog 2016-10-23 02:43:48 UTC (rev 207722)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-10-22 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Backdrop filter doesn't show if removed then re-added
+ https://bugs.webkit.org/show_bug.cgi?id=163860
+
+ Reviewed by Dan Bernstein.
+
+ When a backdrop filter is removed the re-added, updateBackdropFiltersRect() never
+ runs the second time because m_backdropFiltersRect doesn't change. However, we need
+ to run that code to size and position the newly re-created backdrop layer, so run
+ it explicitly if we just created the backdrop layer. This is similar to how
+ updateContentsImage() calls updateContentsRects().
+
+ Test: css3/filters/backdrop/add-remove-add-backdrop-filter.html
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::setBackdropFilters):
+ (WebCore::GraphicsLayerCA::updateBackdropFilters):
+
+2016-10-22 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Fix repainting of slow repaint objects in WK1 when page scale is applied
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163854
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (207721 => 207722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2016-10-23 02:43:42 UTC (rev 207721)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2016-10-23 02:43:48 UTC (rev 207722)
</span><span class="lines">@@ -786,6 +786,7 @@
</span><span class="cx"> // FIXME: This would clear the backdrop filters if we had a software implementation.
</span><span class="cx"> clearBackdropFilters();
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> noteLayerPropertyChanged(BackdropFiltersChanged);
</span><span class="cx"> return canCompositeFilters;
</span><span class="cx"> }
</span><span class="lines">@@ -1970,6 +1971,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool madeLayer = !m_backdropLayer;
</ins><span class="cx"> if (!m_backdropLayer) {
</span><span class="cx"> m_backdropLayer = createPlatformCALayer(PlatformCALayer::LayerTypeBackdropLayer, this);
</span><span class="cx"> m_backdropLayer->setAnchorPoint(FloatPoint3D());
</span><span class="lines">@@ -1986,6 +1988,9 @@
</span><span class="cx"> cloneLayer->setFilters(m_backdropFilters);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ if (madeLayer)
+ updateBackdropFiltersRect();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsLayerCA::updateBackdropFiltersRect()
</span><span class="lines">@@ -2329,7 +2334,7 @@
</span><span class="cx"> // but then what if the layer size changes?
</span><span class="cx"> m_contentsLayer->setMinificationFilter(PlatformCALayer::Trilinear);
</span><span class="cx"> m_contentsLayer->setContents(m_pendingContentsImage.get());
</span><del>- m_pendingContentsImage = 0;
</del><ins>+ m_pendingContentsImage = nullptr;
</ins><span class="cx">
</span><span class="cx"> if (m_contentsLayerClones) {
</span><span class="cx"> LayerMap::const_iterator end = m_contentsLayerClones->end();
</span></span></pre>
</div>
</div>
</body>
</html>