<!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>[196571] 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/196571">196571</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-02-14 21:10:58 -0800 (Sun, 14 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Filters] When applying an SVG filter on a composited image using CSS the image is rendered without the filter
https://bugs.webkit.org/show_bug.cgi?id=154108
Reviewed by Sam Weinig.
Source/WebCore:
When checking whether we can directly composite an image, we need to check for software-rendered
filters.
Test: compositing/filters/simple-image-with-svg-filter.html
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::isDirectlyCompositedImage):
LayoutTests:
* compositing/filters/simple-image-with-svg-filter-expected.html: Added.
* compositing/filters/simple-image-with-svg-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="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositingfilterssimpleimagewithsvgfilterexpectedhtml">trunk/LayoutTests/compositing/filters/simple-image-with-svg-filter-expected.html</a></li>
<li><a href="#trunkLayoutTestscompositingfilterssimpleimagewithsvgfilterhtml">trunk/LayoutTests/compositing/filters/simple-image-with-svg-filter.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196570 => 196571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-02-15 04:49:31 UTC (rev 196570)
+++ trunk/LayoutTests/ChangeLog        2016-02-15 05:10:58 UTC (rev 196571)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-02-14 Simon Fraser <simon.fraser@apple.com>
+
+ [CSS Filters] When applying an SVG filter on a composited image using CSS the image is rendered without the filter
+ https://bugs.webkit.org/show_bug.cgi?id=154108
+
+ Reviewed by Sam Weinig.
+
+ * compositing/filters/simple-image-with-svg-filter-expected.html: Added.
+ * compositing/filters/simple-image-with-svg-filter.html: Added.
+
</ins><span class="cx"> 2016-02-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Window and WorkerGlobalScope should inherit EventTarget
</span></span></pre></div>
<a id="trunkLayoutTestscompositingfilterssimpleimagewithsvgfilterexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/filters/simple-image-with-svg-filter-expected.html (0 => 196571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/filters/simple-image-with-svg-filter-expected.html         (rev 0)
+++ trunk/LayoutTests/compositing/filters/simple-image-with-svg-filter-expected.html        2016-02-15 05:10:58 UTC (rev 196571)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ img {
+ margin: 10px;
+ height: 100px;
+ width: 100px;
+ }
+
+ svg {
+ display: none;
+ }
+ </style>
+</head>
+<body>
+ <!-- These two images should look the same. -->
+ <img style="-webkit-filter: url(#redToGreen);" src="data:image/gif;base64,R0lGODlhAQABAPAAAP8REf///yH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==">
+ <img style="-webkit-filter: url(#redToGreen);" src="data:image/gif;base64,R0lGODlhAQABAPAAAP8REf///yH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==">
+
+ <svg>
+         <filter id="redToGreen">
+ <feColorMatrix type="matrix" values="0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0" />
+ </filter>
+ </svg>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingfilterssimpleimagewithsvgfilterhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/filters/simple-image-with-svg-filter.html (0 => 196571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/filters/simple-image-with-svg-filter.html         (rev 0)
+++ trunk/LayoutTests/compositing/filters/simple-image-with-svg-filter.html        2016-02-15 05:10:58 UTC (rev 196571)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ img {
+ margin: 10px;
+ height: 100px;
+ width: 100px;
+ }
+
+ .composited {
+ -webkit-transform: translateZ(0);
+ }
+
+ svg {
+ display: none;
+ }
+ </style>
+</head>
+<body>
+ <!-- These two images should look the same. -->
+ <img style="-webkit-filter: url(#redToGreen);" src="data:image/gif;base64,R0lGODlhAQABAPAAAP8REf///yH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" class="composited" >
+ <img style="-webkit-filter: url(#redToGreen);" src="data:image/gif;base64,R0lGODlhAQABAPAAAP8REf///yH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==">
+
+ <svg>
+         <filter id="redToGreen">
+ <feColorMatrix type="matrix" values="0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0" />
+ </filter>
+ </svg>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196570 => 196571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-02-15 04:49:31 UTC (rev 196570)
+++ trunk/Source/WebCore/ChangeLog        2016-02-15 05:10:58 UTC (rev 196571)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-02-14 Simon Fraser <simon.fraser@apple.com>
+
+ [CSS Filters] When applying an SVG filter on a composited image using CSS the image is rendered without the filter
+ https://bugs.webkit.org/show_bug.cgi?id=154108
+
+ Reviewed by Sam Weinig.
+
+ When checking whether we can directly composite an image, we need to check for software-rendered
+ filters.
+
+ Test: compositing/filters/simple-image-with-svg-filter.html
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::isDirectlyCompositedImage):
+
</ins><span class="cx"> 2016-02-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop the [EventTarget] WebKit-specific IDL extended attribute
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (196570 => 196571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp        2016-02-15 04:49:31 UTC (rev 196570)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp        2016-02-15 05:10:58 UTC (rev 196571)
</span><span class="lines">@@ -1995,7 +1995,7 @@
</span><span class="cx"> // that require painting. Direct compositing saves backing store.
</span><span class="cx"> bool RenderLayerBacking::isDirectlyCompositedImage() const
</span><span class="cx"> {
</span><del>- if (!is<RenderImage>(renderer()) || m_owningLayer.hasBoxDecorationsOrBackground() || renderer().hasClip())
</del><ins>+ if (!is<RenderImage>(renderer()) || m_owningLayer.hasBoxDecorationsOrBackground() || m_owningLayer.paintsWithFilters() || renderer().hasClip())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span></span></pre>
</div>
</div>
</body>
</html>