<!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>[202022] 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/202022">202022</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-06-13 20:05:21 -0700 (Mon, 13 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>SVG elements don't blend correctly into HTML
https://bugs.webkit.org/show_bug.cgi?id=158718
<rdar://problem/26782004>
Reviewed by Antoine Quint.
Source/WebCore:
We were not creating any transparency layers for the root SVG nodes.
This is ok if the SVG is the root document, because it is the backdrop.
However, if it is inline SVG, it needs to apply the operation in
order to composite into the document.
Test: svg/css/mix-blend-mode-with-inline-svg.html
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::beginTransparencyLayers):
LayoutTests:
* svg/css/mix-blend-mode-with-inline-svg-expected.html: Added.
* svg/css/mix-blend-mode-with-inline-svg.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="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssvgcssmixblendmodewithinlinesvgexpectedhtml">trunk/LayoutTests/svg/css/mix-blend-mode-with-inline-svg-expected.html</a></li>
<li><a href="#trunkLayoutTestssvgcssmixblendmodewithinlinesvghtml">trunk/LayoutTests/svg/css/mix-blend-mode-with-inline-svg.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202021 => 202022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-14 02:29:26 UTC (rev 202021)
+++ trunk/LayoutTests/ChangeLog 2016-06-14 03:05:21 UTC (rev 202022)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-13 Dean Jackson <dino@apple.com>
+
+ SVG elements don't blend correctly into HTML
+ https://bugs.webkit.org/show_bug.cgi?id=158718
+ <rdar://problem/26782004>
+
+ Reviewed by Antoine Quint.
+
+ * svg/css/mix-blend-mode-with-inline-svg-expected.html: Added.
+ * svg/css/mix-blend-mode-with-inline-svg.html: Added.
+
</ins><span class="cx"> 2016-06-13 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> storage/indexeddb/modern/leaks-1.html leaks the database connection handle.
</span></span></pre></div>
<a id="trunkLayoutTestssvgcssmixblendmodewithinlinesvgexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/css/mix-blend-mode-with-inline-svg-expected.html (0 => 202022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/mix-blend-mode-with-inline-svg-expected.html (rev 0)
+++ trunk/LayoutTests/svg/css/mix-blend-mode-with-inline-svg-expected.html 2016-06-14 03:05:21 UTC (rev 202022)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE html>
+<body>
+<svg width="300" height="300">
+ <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>
+</body>
</ins><span class="cx">Property changes on: trunk/LayoutTests/svg/css/mix-blend-mode-with-inline-svg-expected.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestssvgcssmixblendmodewithinlinesvghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/css/mix-blend-mode-with-inline-svg.html (0 => 202022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/mix-blend-mode-with-inline-svg.html (rev 0)
+++ trunk/LayoutTests/svg/css/mix-blend-mode-with-inline-svg.html 2016-06-14 03:05:21 UTC (rev 202022)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE html>
+<body>
+<svg width="300" height="300" style="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>
+</body>
</ins><span class="cx">Property changes on: trunk/LayoutTests/svg/css/mix-blend-mode-with-inline-svg.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202021 => 202022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-14 02:29:26 UTC (rev 202021)
+++ trunk/Source/WebCore/ChangeLog 2016-06-14 03:05:21 UTC (rev 202022)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-06-13 Dean Jackson <dino@apple.com>
+
+ SVG elements don't blend correctly into HTML
+ https://bugs.webkit.org/show_bug.cgi?id=158718
+ <rdar://problem/26782004>
+
+ Reviewed by Antoine Quint.
+
+ We were not creating any transparency layers for the root SVG nodes.
+ This is ok if the SVG is the root document, because it is the backdrop.
+ However, if it is inline SVG, it needs to apply the operation in
+ order to composite into the document.
+
+ Test: svg/css/mix-blend-mode-with-inline-svg.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::beginTransparencyLayers):
+
</ins><span class="cx"> 2016-06-13 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> storage/indexeddb/modern/leaks-1.html leaks the database connection handle.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (202021 => 202022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-06-14 02:29:26 UTC (rev 202021)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-06-14 03:05:21 UTC (rev 202022)
</span><span class="lines">@@ -1815,15 +1815,15 @@
</span><span class="cx"> context.clip(pixelSnappedClipRect);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- // RenderSVGRoot takes care of its blend mode.
- if (!renderer().isSVGRoot() && hasBlendMode())
</del><ins>+ bool usesCompositeOperation = hasBlendMode() && !(renderer().isSVGRoot() && parent() && parent()->isRootLayer());
+ if (usesCompositeOperation)
</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 (!renderer().isSVGRoot() && hasBlendMode())
</del><ins>+ if (usesCompositeOperation)
</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>