<!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>[169368] trunk/Source/WebCore</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/169368">169368</a></dd>
<dt>Author</dt> <dd>pdr@google.com</dd>
<dt>Date</dt> <dd>2014-05-26 22:23:57 -0700 (Mon, 26 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove special case for transparent SVG root layers
https://bugs.webkit.org/show_bug.cgi?id=116856
Reviewed by Dirk Schulze.
This patch removes a special case from RenderLayer for root SVG layers
with opacity. Instead of checking whether a composited layer exists in
SVGRenderingContext::prepareToRenderSVGContent we now exclude the root
SVG renderobject from the opacity checks in prepareToRenderSVGContent.
This is a merge of https://src.chromium.org/viewvc/blink?view=rev&revision=174102
by Philip Rogers <pdr@chromium.org>.
No new tests as this is covered by svg/custom/composited-svg-with-opacity.html.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::isTransparent): Deleted.
* rendering/RenderLayer.h:
* rendering/svg/SVGRenderingContext.cpp:
(WebCore::SVGRenderingContext::prepareToRenderSVGContent):
The opacity case for root svg renderers is now handled by
RenderLayer.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderingContextcpp">trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169367 => 169368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-27 04:52:36 UTC (rev 169367)
+++ trunk/Source/WebCore/ChangeLog 2014-05-27 05:23:57 UTC (rev 169368)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-05-26 Philip Rogers <pdr@google.com>
+
+ Remove special case for transparent SVG root layers
+ https://bugs.webkit.org/show_bug.cgi?id=116856
+
+ Reviewed by Dirk Schulze.
+
+ This patch removes a special case from RenderLayer for root SVG layers
+ with opacity. Instead of checking whether a composited layer exists in
+ SVGRenderingContext::prepareToRenderSVGContent we now exclude the root
+ SVG renderobject from the opacity checks in prepareToRenderSVGContent.
+
+ This is a merge of https://src.chromium.org/viewvc/blink?view=rev&revision=174102
+ by Philip Rogers <pdr@chromium.org>.
+
+ No new tests as this is covered by svg/custom/composited-svg-with-opacity.html.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::isTransparent): Deleted.
+ * rendering/RenderLayer.h:
+ * rendering/svg/SVGRenderingContext.cpp:
+ (WebCore::SVGRenderingContext::prepareToRenderSVGContent):
+ The opacity case for root svg renderers is now handled by
+ RenderLayer.
+
</ins><span class="cx"> 2014-05-26 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> CSS JIT: Fix build error raised when CSS_SELECTOR_JIT_DEBUGGING is 1
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (169367 => 169368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-05-27 04:52:36 UTC (rev 169367)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-05-27 05:23:57 UTC (rev 169368)
</span><span class="lines">@@ -1534,13 +1534,6 @@
</span><span class="cx"> return parent()->cannotBlitToWindow();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderLayer::isTransparent() const
-{
- if (renderer().element() && renderer().element()->isSVGElement())
- return false;
- return renderer().isTransparent() || renderer().hasMask();
-}
-
</del><span class="cx"> RenderLayer* RenderLayer::transparentPaintingAncestor()
</span><span class="cx"> {
</span><span class="cx"> if (isComposited())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (169367 => 169368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2014-05-27 04:52:36 UTC (rev 169367)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2014-05-27 05:23:57 UTC (rev 169368)
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx">
</span><span class="cx"> bool cannotBlitToWindow() const;
</span><span class="cx">
</span><del>- bool isTransparent() const;
</del><ins>+ bool isTransparent() const { return renderer().isTransparent() || renderer().hasMask(); }
</ins><span class="cx"> RenderLayer* transparentPaintingAncestor();
</span><span class="cx"> void beginTransparencyLayers(GraphicsContext*, const RenderLayer* rootLayer, const LayoutRect& paintDirtyRect, PaintBehavior);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp (169367 => 169368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2014-05-27 04:52:36 UTC (rev 169367)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2014-05-27 05:23:57 UTC (rev 169368)
</span><span class="lines">@@ -101,7 +101,8 @@
</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 || (renderer.hasLayer() && toRenderLayerModelObject(renderer).layer()->isComposited()) ? 1 : style.opacity();
</del><ins>+ // RenderLayer takes care of root opacity.
+ float opacity = (renderer.isSVGRoot() || isRenderingMask) ? 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>