<!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>[168651] 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/168651">168651</a></dd>
<dt>Author</dt> <dd>krit@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-12 15:57:46 -0700 (Mon, 12 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre><svg> with opacity and compositing double-applies its opacity
https://bugs.webkit.org/show_bug.cgi?id=116856
Reviewed by Simon Fraser.
Source/WebCore:
The opacity is applied by the compositor. However, all SVG elements
create transparency layers on their own to apply opacity. So did
SVGSVGElement.
Added a check if the current element has a compositing layer and skip
creating transparency layer if it has.
Test: svg/custom/composited-svg-with-opacity.html
* rendering/svg/SVGRenderingContext.cpp:
(WebCore::SVGRenderingContext::prepareToRenderSVGContent):
LayoutTests:
Test that opacity is not applied twice for composited inline SVG.
* svg/custom/composited-svg-with-opacity-expected.html: Added.
* svg/custom/composited-svg-with-opacity.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="#trunkSourceWebCorerenderingsvgSVGRenderingContextcpp">trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssvgcustomcompositedsvgwithopacityexpectedhtml">trunk/LayoutTests/svg/custom/composited-svg-with-opacity-expected.html</a></li>
<li><a href="#trunkLayoutTestssvgcustomcompositedsvgwithopacityhtml">trunk/LayoutTests/svg/custom/composited-svg-with-opacity.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168650 => 168651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-12 22:47:39 UTC (rev 168650)
+++ trunk/LayoutTests/ChangeLog 2014-05-12 22:57:46 UTC (rev 168651)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2014-05-12 Dirk Schulze <krit@webkit.org>
</span><span class="cx">
</span><ins>+ <svg> with opacity and compositing double-applies its opacity
+ https://bugs.webkit.org/show_bug.cgi?id=116856
+
+ Reviewed by Simon Fraser.
+
+ Test that opacity is not applied twice for composited inline SVG.
+
+ * svg/custom/composited-svg-with-opacity-expected.html: Added.
+ * svg/custom/composited-svg-with-opacity.html: Added.
+
+2014-05-12 Dirk Schulze <krit@webkit.org>
+
</ins><span class="cx"> SVG outline property is broken and inefficient
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=113666
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestssvgcustomcompositedsvgwithopacityexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/custom/composited-svg-with-opacity-expected.html (0 => 168651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/composited-svg-with-opacity-expected.html (rev 0)
+++ trunk/LayoutTests/svg/custom/composited-svg-with-opacity-expected.html 2014-05-12 22:57:46 UTC (rev 168651)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+
+<html>
+<style>
+div {
+ display: inline-block;
+}
+
+svg {
+ width: 100px;
+ height: 100px;
+ margin: 10px;
+}
+rect {
+ opacity: 0.5;
+}
+</style>
+<body>
+ <div>
+ <svg>
+ <rect width="100" height="100"></rect>
+ </svg>
+ </div>
+
+ <div>
+ <svg>
+ <rect width="100" height="100"></rect>
+ </svg>
+ </div>
+
+ <div>
+ <svg>
+ <rect width="100" height="100"></rect>
+ </svg>
+ </div>
+
+ <div>
+ <svg>
+ <rect width="100" height="100"></rect>
+ </svg>
+ </div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestssvgcustomcompositedsvgwithopacityhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/custom/composited-svg-with-opacity.html (0 => 168651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/composited-svg-with-opacity.html (rev 0)
+++ trunk/LayoutTests/svg/custom/composited-svg-with-opacity.html 2014-05-12 22:57:46 UTC (rev 168651)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+
+<html>
+<style>
+div {
+ display: inline-block;
+}
+
+svg {
+ width: 100px;
+ height: 100px;
+ margin: 10px;
+}
+</style>
+<body>
+ <div style="opacity: 0.5;">
+ <svg>
+ <rect width="100" height="100"></rect>
+ </svg>
+ </div>
+
+ <div style="opacity: 0.5; -webkit-transform: translateZ(0);">
+ <svg>
+ <rect width="100" height="100"></rect>
+ </svg>
+ </div>
+
+ <div>
+ <svg style="opacity: 0.5;">
+ <rect width="100" height="100"></rect>
+ </svg>
+ </div>
+
+ <div>
+ <svg style="opacity: 0.5; -webkit-transform: translateZ(0);">
+ <rect width="100" height="100"></rect>
+ </svg>
+ </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 (168650 => 168651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-12 22:47:39 UTC (rev 168650)
+++ trunk/Source/WebCore/ChangeLog 2014-05-12 22:57:46 UTC (rev 168651)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-05-12 Dirk Schulze <krit@webkit.org>
+
+ <svg> with opacity and compositing double-applies its opacity
+ https://bugs.webkit.org/show_bug.cgi?id=116856
+
+ Reviewed by Simon Fraser.
+
+ The opacity is applied by the compositor. However, all SVG elements
+ create transparency layers on their own to apply opacity. So did
+ SVGSVGElement.
+
+ Added a check if the current element has a compositing layer and skip
+ creating transparency layer if it has.
+
+ Test: svg/custom/composited-svg-with-opacity.html
+
+ * rendering/svg/SVGRenderingContext.cpp:
+ (WebCore::SVGRenderingContext::prepareToRenderSVGContent):
+
</ins><span class="cx"> 2014-05-12 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Teach Editor to support more direct replacement of a Node
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp (168650 => 168651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2014-05-12 22:47:39 UTC (rev 168650)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2014-05-12 22:57:46 UTC (rev 168651)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">
</span><span class="cx"> // Setup transparency layers before setting up SVG resources!
</span><span class="cx"> bool isRenderingMask = isRenderingMaskImage(*m_renderer);
</span><del>- float opacity = isRenderingMask ? 1 : style.opacity();
</del><ins>+ float opacity = isRenderingMask || (renderer.hasLayer() && toRenderLayerModelObject(renderer).layer()->isComposited()) ? 1 : style.opacity();
</ins><span class="cx"> const ShadowData* shadow = svgStyle.shadow();
</span><span class="cx"> bool hasBlendMode = style.hasBlendMode();
</span><span class="cx"> bool hasIsolation = style.hasIsolation();
</span></span></pre>
</div>
</div>
</body>
</html>