<!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>[195724] 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/195724">195724</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-27 18:21:25 -0800 (Wed, 27 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Garbage is displayed when root svg element has mix-blend-mode set
https://bugs.webkit.org/show_bug.cgi?id=150556
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2016-01-27
Reviewed by Darin Adler.
Source/WebCore:
This bug happens when compositing on a CALayer and drawing on a transparent
layer, so it happens with WK2 with <svg style="mix-blend-mode...">. And it
can happen with WK1 also with <svg style="opacity=...;mix-blend-mode...">.
But in both cases, the SVG root renderer should be the root of the render
tree. So it happens only with the stand alone SVG documents.
SVGRenderContext::prepareToRenderSVGContent() ignores the opacity of
the SVG root but it creates a transparent layer for the blend-mode.
But RenderLayer::beginTransparencyLayers() creates a transparent layer
for opacity and it sets the blend-mode also.
The fix is to begin two transparent layers for the SVG root renderer: one
for the opacity and the second for the blend-mode. The opacity transparent
layer will be still managed by RenderLayer::beginTransparencyLayers(). While
the blend-mode transparent layer will be managed by SVGRenderContext
::prepareToRenderSVGContent().
Tests: svg/css/mix-blend-mode-background-root.svg
svg/css/mix-blend-mode-opacity-root.svg
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::beginTransparencyLayers):
LayoutTests:
Ensure blending the SVG root renderer will be displayed correctly with
compositing when the SVG root renderer is the root of the render tree.
* svg/css/mix-blend-mode-background-root-expected.svg: Added.
* svg/css/mix-blend-mode-background-root.svg: Added.
* svg/css/mix-blend-mode-opacity-root-expected.svg: Added.
* svg/css/mix-blend-mode-opacity-root.svg: 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="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssvgcssmixblendmodebackgroundrootexpectedsvg">trunk/LayoutTests/svg/css/mix-blend-mode-background-root-expected.svg</a></li>
<li><a href="#trunkLayoutTestssvgcssmixblendmodebackgroundrootsvg">trunk/LayoutTests/svg/css/mix-blend-mode-background-root.svg</a></li>
<li><a href="#trunkLayoutTestssvgcssmixblendmodeopacityrootexpectedsvg">trunk/LayoutTests/svg/css/mix-blend-mode-opacity-root-expected.svg</a></li>
<li><a href="#trunkLayoutTestssvgcssmixblendmodeopacityrootsvg">trunk/LayoutTests/svg/css/mix-blend-mode-opacity-root.svg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195723 => 195724)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-28 02:14:34 UTC (rev 195723)
+++ trunk/LayoutTests/ChangeLog 2016-01-28 02:21:25 UTC (rev 195724)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-01-27 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Garbage is displayed when root svg element has mix-blend-mode set
+ https://bugs.webkit.org/show_bug.cgi?id=150556
+
+ Reviewed by Darin Adler.
+
+ Ensure blending the SVG root renderer will be displayed correctly with
+ compositing when the SVG root renderer is the root of the render tree.
+
+ * svg/css/mix-blend-mode-background-root-expected.svg: Added.
+ * svg/css/mix-blend-mode-background-root.svg: Added.
+ * svg/css/mix-blend-mode-opacity-root-expected.svg: Added.
+ * svg/css/mix-blend-mode-opacity-root.svg: Added.
+
</ins><span class="cx"> 2016-01-27 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Incorrect handling of iterating cursors to their end.
</span></span></pre></div>
<a id="trunkLayoutTestssvgcssmixblendmodebackgroundrootexpectedsvg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/css/mix-blend-mode-background-root-expected.svg (0 => 195724)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/mix-blend-mode-background-root-expected.svg (rev 0)
+++ trunk/LayoutTests/svg/css/mix-blend-mode-background-root-expected.svg 2016-01-28 02:21:25 UTC (rev 195724)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<svg xmlns="http://www.w3.org/2000/svg">
+ <rect x="20" y="20" width="100" height="100" fill="rgb(0,255,255)"/>
+ <rect x="140" y="20" width="100" height="100" fill="rgb(255,0,255)"/>
+ <rect x="20" y="140" width="100" height="100" fill="rgb(255,255,0)"/>
+ <rect x="140" y="140" width="100" height="100" fill="rgb(0,0,0)"/>
+</svg>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgcssmixblendmodebackgroundrootsvg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/css/mix-blend-mode-background-root.svg (0 => 195724)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/mix-blend-mode-background-root.svg (rev 0)
+++ trunk/LayoutTests/svg/css/mix-blend-mode-background-root.svg 2016-01-28 02:21:25 UTC (rev 195724)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<svg xmlns="http://www.w3.org/2000/svg" style="background-color:white; mix-blend-mode: difference;">
+ <rect x="20" y="20" width="100" height="100" fill="rgb(255,0,0)"/>
+ <rect x="140" y="20" width="100" height="100" fill="rgb(0,255,0)"/>
+ <rect x="20" y="140" width="100" height="100" fill="rgb(0,0,255)"/>
+ <rect x="140" y="140" width="100" height="100" fill="rgb(255,255,255)"/>
+</svg>
+
</ins></span></pre></div>
<a id="trunkLayoutTestssvgcssmixblendmodeopacityrootexpectedsvg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/css/mix-blend-mode-opacity-root-expected.svg (0 => 195724)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/mix-blend-mode-opacity-root-expected.svg (rev 0)
+++ trunk/LayoutTests/svg/css/mix-blend-mode-opacity-root-expected.svg 2016-01-28 02:21:25 UTC (rev 195724)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<svg xmlns="http://www.w3.org/2000/svg" style="opacity: 0.6;">
+ <rect x="20" y="20" width="100" height="100" fill="rgb(0,255,255)"/>
+ <rect x="140" y="20" width="100" height="100" fill="rgb(255,0,255)"/>
+ <rect x="20" y="140" width="100" height="100" fill="rgb(255,255,0)"/>
+ <rect x="140" y="140" width="100" height="100" fill="rgb(0,0,0)"/>
+</svg>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgcssmixblendmodeopacityrootsvg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/css/mix-blend-mode-opacity-root.svg (0 => 195724)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/mix-blend-mode-opacity-root.svg (rev 0)
+++ trunk/LayoutTests/svg/css/mix-blend-mode-opacity-root.svg 2016-01-28 02:21:25 UTC (rev 195724)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<svg xmlns="http://www.w3.org/2000/svg" style="opacity: 0.6; mix-blend-mode: difference;">
+ <rect x="20" y="20" width="100" height="100" fill="rgb(255,0,0)"/>
+ <rect x="140" y="20" width="100" height="100" fill="rgb(0,255,0)"/>
+ <rect x="20" y="140" width="100" height="100" fill="rgb(0,0,255)"/>
+ <rect x="140" y="140" width="100" height="100" fill="rgb(255,255,255)"/>
+</svg>
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195723 => 195724)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-28 02:14:34 UTC (rev 195723)
+++ trunk/Source/WebCore/ChangeLog 2016-01-28 02:21:25 UTC (rev 195724)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-01-27 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Garbage is displayed when root svg element has mix-blend-mode set
+ https://bugs.webkit.org/show_bug.cgi?id=150556
+
+ Reviewed by Darin Adler.
+
+ This bug happens when compositing on a CALayer and drawing on a transparent
+ layer, so it happens with WK2 with <svg style="mix-blend-mode...">. And it
+ can happen with WK1 also with <svg style="opacity=...;mix-blend-mode...">.
+ But in both cases, the SVG root renderer should be the root of the render
+ tree. So it happens only with the stand alone SVG documents.
+
+ SVGRenderContext::prepareToRenderSVGContent() ignores the opacity of
+ the SVG root but it creates a transparent layer for the blend-mode.
+
+ But RenderLayer::beginTransparencyLayers() creates a transparent layer
+ for opacity and it sets the blend-mode also.
+
+ The fix is to begin two transparent layers for the SVG root renderer: one
+ for the opacity and the second for the blend-mode. The opacity transparent
+ layer will be still managed by RenderLayer::beginTransparencyLayers(). While
+ the blend-mode transparent layer will be managed by SVGRenderContext
+ ::prepareToRenderSVGContent().
+
+ Tests: svg/css/mix-blend-mode-background-root.svg
+ svg/css/mix-blend-mode-opacity-root.svg
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::beginTransparencyLayers):
+
</ins><span class="cx"> 2016-01-27 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Cache results of data detection in the UI process when load completes.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (195723 => 195724)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-01-28 02:14:34 UTC (rev 195723)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-01-28 02:21:25 UTC (rev 195724)
</span><span class="lines">@@ -1804,14 +1804,15 @@
</span><span class="cx"> context.clip(pixelSnappedClipRect);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- if (hasBlendMode())
</del><ins>+ // RenderSVGRoot takes care of its blend mode.
+ if (!renderer().isSVGRoot() && hasBlendMode())
</ins><span class="cx"> context.setCompositeOperation(context.compositeOperation(), blendMode());
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> context.beginTransparencyLayer(renderer().opacity());
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- if (hasBlendMode())
</del><ins>+ if (!renderer().isSVGRoot() && hasBlendMode())
</ins><span class="cx"> context.setCompositeOperation(context.compositeOperation(), BlendModeNormal);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>