<!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>[166526] 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/166526">166526</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-31 14:07:39 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Blending] Blend mode property is propagated to multiple GraphicLayers
https://bugs.webkit.org/show_bug.cgi?id=130337
Patch by Ion Rosca <rosca@adobe.com> on 2014-03-31
Reviewed by Dean Jackson.
Source/WebCore:
Resets the blend mode for graphicsLayer when it has an ancestorClippingLayer.
Test: css3/compositing/blend-mode-ancestor-clipping-layer.html
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::updateBlendMode):
(WebCore::RenderLayer::calculateClipRects):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateBlendMode):
* rendering/RenderLayerBacking.h:
LayoutTests:
* css3/compositing/blend-mode-ancestor-clipping-layer-expected.txt: Added.
* css3/compositing/blend-mode-ancestor-clipping-layer.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>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingh">trunk/Source/WebCore/rendering/RenderLayerBacking.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3compositingblendmodeancestorclippinglayerexpectedtxt">trunk/LayoutTests/css3/compositing/blend-mode-ancestor-clipping-layer-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3compositingblendmodeancestorclippinglayerhtml">trunk/LayoutTests/css3/compositing/blend-mode-ancestor-clipping-layer.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166525 => 166526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-31 21:06:48 UTC (rev 166525)
+++ trunk/LayoutTests/ChangeLog 2014-03-31 21:07:39 UTC (rev 166526)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2014-03-31 Ion Rosca <rosca@adobe.com>
</span><span class="cx">
</span><ins>+ [CSS Blending] Blend mode property is propagated to multiple GraphicLayers
+ https://bugs.webkit.org/show_bug.cgi?id=130337
+
+ Reviewed by Dean Jackson.
+
+ * css3/compositing/blend-mode-ancestor-clipping-layer-expected.txt: Added.
+ * css3/compositing/blend-mode-ancestor-clipping-layer.html: Added.
+
+2014-03-31 Ion Rosca <rosca@adobe.com>
+
</ins><span class="cx"> [CSS Blending] showLayerTree should dump layer's blend mode and isolation properties
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=130922
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestscss3compositingblendmodeancestorclippinglayerexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/blend-mode-ancestor-clipping-layer-expected.txt (0 => 166526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-ancestor-clipping-layer-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/compositing/blend-mode-ancestor-clipping-layer-expected.txt 2014-03-31 21:07:39 UTC (rev 166526)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+(GraphicsLayer
+ (bounds 800.00 600.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (contentsOpaque 1)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (drawsContent 1)
+ (children 1
+ (GraphicsLayer
+ (position 8.00 8.00)
+ (bounds 100.00 100.00)
+ (blendMode difference)
+ (children 1
+ (GraphicsLayer
+ (bounds 200.00 200.00)
+ (contentsOpaque 1)
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingblendmodeancestorclippinglayerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/blend-mode-ancestor-clipping-layer.html (0 => 166526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-ancestor-clipping-layer.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/blend-mode-ancestor-clipping-layer.html 2014-03-31 21:07:39 UTC (rev 166526)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+ <!DOCTYPE HTML>
+<!-- Test if the blend mode property is propagated to the ancestorClippingLayer. -->
+
+ <style>
+ .parent {
+ width: 100px;
+ height: 100px;
+ background: yellow;
+ overflow: hidden;
+ }
+
+ .child {
+ width: 200px;
+ height: 200px;
+ background: red;
+ -webkit-transform:translateZ(0px);
+ -webkit-mix-blend-mode: difference;
+ }
+ </style>
+
+ <div class="parent">
+ <div class="child"></div>
+ </div>
+ <pre id="layerTree"></pre>
+
+ <script>
+ if (window.testRunner)
+ window.testRunner.dumpAsText();
+
+ var text = document.getElementById("layerTree");
+ text.innerHTML = window.internals.layerTreeAsText(document);
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166525 => 166526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-31 21:06:48 UTC (rev 166525)
+++ trunk/Source/WebCore/ChangeLog 2014-03-31 21:07:39 UTC (rev 166526)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-03-31 Ion Rosca <rosca@adobe.com>
</span><span class="cx">
</span><ins>+ [CSS Blending] Blend mode property is propagated to multiple GraphicLayers
+ https://bugs.webkit.org/show_bug.cgi?id=130337
+
+ Reviewed by Dean Jackson.
+
+ Resets the blend mode for graphicsLayer when it has an ancestorClippingLayer.
+
+ Test: css3/compositing/blend-mode-ancestor-clipping-layer.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::updateBlendMode):
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateBlendMode):
+ * rendering/RenderLayerBacking.h:
+
+2014-03-31 Ion Rosca <rosca@adobe.com>
+
</ins><span class="cx"> [CSS Blending] showLayerTree should dump layer's blend mode and isolation properties
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=130922
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (166525 => 166526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-03-31 21:06:48 UTC (rev 166525)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-03-31 21:07:39 UTC (rev 166526)
</span><span class="lines">@@ -815,11 +815,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BlendMode newBlendMode = renderer().style().blendMode();
</span><del>- if (newBlendMode != m_blendMode) {
</del><ins>+ if (newBlendMode != m_blendMode)
</ins><span class="cx"> m_blendMode = newBlendMode;
</span><del>- if (backing())
- backing()->setBlendMode(newBlendMode);
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayer::updateNonCompositedParentStackingContextHasBlendedChild(bool hasBlendedChild)
</span><span class="lines">@@ -5930,9 +5927,6 @@
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><span class="cx"> updateOrRemoveFilterEffectRenderer();
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_COMPOSITING)
- backing()->setBlendMode(m_blendMode);
-#endif
</del><span class="cx"> }
</span><span class="cx"> return m_backing.get();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (166525 => 166526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-31 21:06:48 UTC (rev 166525)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-31 21:07:39 UTC (rev 166526)
</span><span class="lines">@@ -394,9 +394,10 @@
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> void RenderLayerBacking::updateBlendMode(const RenderStyle* style)
</span><span class="cx"> {
</span><del>- if (m_ancestorClippingLayer)
</del><ins>+ if (m_ancestorClippingLayer) {
</ins><span class="cx"> m_ancestorClippingLayer->setBlendMode(style->blendMode());
</span><del>- else
</del><ins>+ m_graphicsLayer->setBlendMode(BlendModeNormal);
+ } else
</ins><span class="cx"> m_graphicsLayer->setBlendMode(style->blendMode());
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -2047,13 +2048,6 @@
</span><span class="cx"> compositor().repaintInCompositedAncestor(m_owningLayer, compositedBounds());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_COMPOSITING)
-void RenderLayerBacking::setBlendMode(BlendMode blendMode)
-{
- m_graphicsLayer->setBlendMode(blendMode);
-}
-#endif
-
</del><span class="cx"> void RenderLayerBacking::setContentsNeedDisplay(GraphicsLayer::ShouldClipToLayer shouldClip)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!paintsIntoCompositedAncestor());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (166525 => 166526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-03-31 21:06:48 UTC (rev 166525)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-03-31 21:07:39 UTC (rev 166526)
</span><span class="lines">@@ -214,10 +214,6 @@
</span><span class="cx"> // Return an estimate of the backing store area (in pixels) allocated by this object's GraphicsLayers.
</span><span class="cx"> double backingStoreMemoryEstimate() const;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_COMPOSITING)
- void setBlendMode(BlendMode);
-#endif
-
</del><span class="cx"> LayoutSize devicePixelFractionFromRenderer() const { return m_devicePixelFractionFromRenderer; }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>
</body>
</html>