<!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>[166525] 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/166525">166525</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-31 14:06:48 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Blending] showLayerTree should dump layer's blend mode and isolation properties
https://bugs.webkit.org/show_bug.cgi?id=130922
Patch by Ion Rosca <rosca@adobe.com> on 2014-03-31
Reviewed by Simon Fraser.
Source/WebCore:
This change only updates existing tests involving blending. No new test required,
as there is no new or changed functionality.
* rendering/RenderLayer.h: adding blendMode() getter.
* rendering/RenderTreeAsText.cpp:
(WebCore::write):
adding blendMode property and layer's isolation status (does layer isolate blending descendants or not?).
LayoutTests:
Tests are adapted after adding blending information to RenderTreeAsText.
* platform/mac/css3/compositing/blend-mode-background-expected.txt:
* platform/mac/css3/compositing/blend-mode-isolated-group-1-expected.txt:
* platform/mac/css3/compositing/blend-mode-isolated-group-2-expected.txt:
* platform/mac/css3/compositing/blend-mode-isolated-group-3-expected.txt:
* platform/mac/css3/compositing/blend-mode-layers-expected.txt:
* platform/mac/css3/compositing/blend-mode-reflection-expected.txt:
* platform/mac/css3/compositing/blend-mode-simple-composited-expected.txt:
* platform/mac/css3/compositing/blend-mode-simple-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingblendmodebackgroundexpectedtxt">trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-background-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingblendmodeisolatedgroup1expectedtxt">trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-isolated-group-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingblendmodeisolatedgroup2expectedtxt">trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-isolated-group-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingblendmodeisolatedgroup3expectedtxt">trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-isolated-group-3-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingblendmodelayersexpectedtxt">trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-layers-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingblendmodereflectionexpectedtxt">trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-reflection-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingblendmodesimplecompositedexpectedtxt">trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-composited-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingblendmodesimpleexpectedtxt">trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTreeAsTextcpp">trunk/Source/WebCore/rendering/RenderTreeAsText.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166524 => 166525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-31 21:04:03 UTC (rev 166524)
+++ trunk/LayoutTests/ChangeLog 2014-03-31 21:06:48 UTC (rev 166525)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-03-31 Ion Rosca <rosca@adobe.com>
+
+ [CSS Blending] showLayerTree should dump layer's blend mode and isolation properties
+ https://bugs.webkit.org/show_bug.cgi?id=130922
+
+ Reviewed by Simon Fraser.
+
+ Tests are adapted after adding blending information to RenderTreeAsText.
+
+ * platform/mac/css3/compositing/blend-mode-background-expected.txt:
+ * platform/mac/css3/compositing/blend-mode-isolated-group-1-expected.txt:
+ * platform/mac/css3/compositing/blend-mode-isolated-group-2-expected.txt:
+ * platform/mac/css3/compositing/blend-mode-isolated-group-3-expected.txt:
+ * platform/mac/css3/compositing/blend-mode-layers-expected.txt:
+ * platform/mac/css3/compositing/blend-mode-reflection-expected.txt:
+ * platform/mac/css3/compositing/blend-mode-simple-composited-expected.txt:
+ * platform/mac/css3/compositing/blend-mode-simple-expected.txt:
+
</ins><span class="cx"> 2014-03-31 Samuel White <samuel_white@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Need ability to get line range for text marker.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodebackgroundexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-background-expected.txt (166524 => 166525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-background-expected.txt 2014-03-31 21:04:03 UTC (rev 166524)
+++ trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-background-expected.txt 2014-03-31 21:06:48 UTC (rev 166525)
</span><span class="lines">@@ -3,5 +3,5 @@
</span><span class="cx"> layer at (0,0) size 800x100
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x100
</span><span class="cx"> RenderBody {BODY} at (8,20) size 784x60 [bgcolor=#0000FF]
</span><del>-layer at (28,20) size 60x60
</del><ins>+layer at (28,20) size 60x60 blendMode: difference
</ins><span class="cx"> RenderBlock {DIV} at (20,0) size 60x60 [bgcolor=#FF0000]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodeisolatedgroup1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-isolated-group-1-expected.txt (166524 => 166525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-isolated-group-1-expected.txt 2014-03-31 21:04:03 UTC (rev 166524)
+++ trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-isolated-group-1-expected.txt 2014-03-31 21:06:48 UTC (rev 166525)
</span><span class="lines">@@ -3,19 +3,19 @@
</span><span class="cx"> layer at (0,0) size 800x108
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x108
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x0 [bgcolor=#0000FF]
</span><del>-layer at (28,28) size 60x60
</del><ins>+layer at (28,28) size 60x60 isolatesBlending
</ins><span class="cx"> RenderBlock (floating) {DIV} at (20,20) size 60x60 [bgcolor=#EE82EE]
</span><del>-layer at (48,48) size 60x60
</del><ins>+layer at (48,48) size 60x60 blendMode: multiply
</ins><span class="cx"> RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000]
</span><span class="cx"> layer at (128,28) size 60x60
</span><span class="cx"> RenderBlock (floating) {DIV} at (120,20) size 60x60 [bgcolor=#EE82EE]
</span><del>-layer at (148,48) size 60x60
</del><ins>+layer at (148,48) size 60x60 blendMode: multiply
</ins><span class="cx"> RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000]
</span><span class="cx"> layer at (228,28) size 60x60
</span><span class="cx"> RenderBlock (floating) {DIV} at (220,20) size 60x60 [bgcolor=#EE82EE]
</span><del>-layer at (248,48) size 60x60
</del><ins>+layer at (248,48) size 60x60 blendMode: multiply
</ins><span class="cx"> RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000]
</span><span class="cx"> layer at (328,28) size 60x60
</span><span class="cx"> RenderBlock (floating) {DIV} at (320,20) size 60x60 [bgcolor=#EE82EE]
</span><del>-layer at (348,48) size 60x60
</del><ins>+layer at (348,48) size 60x60 blendMode: multiply
</ins><span class="cx"> RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodeisolatedgroup2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-isolated-group-2-expected.txt (166524 => 166525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-isolated-group-2-expected.txt 2014-03-31 21:04:03 UTC (rev 166524)
+++ trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-isolated-group-2-expected.txt 2014-03-31 21:06:48 UTC (rev 166525)
</span><span class="lines">@@ -3,19 +3,19 @@
</span><span class="cx"> layer at (0,0) size 800x108
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x108
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x0 [bgcolor=#0000FF]
</span><del>-layer at (28,28) size 60x60
</del><ins>+layer at (28,28) size 60x60 isolatesBlending
</ins><span class="cx"> RenderBlock (floating) {DIV} at (20,20) size 60x60 [bgcolor=#EE82EE]
</span><del>-layer at (48,48) size 60x60
</del><ins>+layer at (48,48) size 60x60 blendMode: multiply
</ins><span class="cx"> RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000]
</span><span class="cx"> layer at (128,28) size 60x60
</span><span class="cx"> RenderBlock (floating) {DIV} at (120,20) size 60x60 [bgcolor=#EE82EE]
</span><del>-layer at (148,48) size 60x60
</del><ins>+layer at (148,48) size 60x60 blendMode: multiply
</ins><span class="cx"> RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000]
</span><span class="cx"> layer at (228,28) size 60x60
</span><span class="cx"> RenderBlock (floating) {DIV} at (220,20) size 60x60 [bgcolor=#EE82EE]
</span><del>-layer at (248,48) size 60x60
</del><ins>+layer at (248,48) size 60x60 blendMode: multiply
</ins><span class="cx"> RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000]
</span><span class="cx"> layer at (328,28) size 60x60
</span><span class="cx"> RenderBlock (floating) {DIV} at (320,20) size 60x60 [bgcolor=#EE82EE]
</span><del>-layer at (348,48) size 60x60
</del><ins>+layer at (348,48) size 60x60 blendMode: multiply
</ins><span class="cx"> RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodeisolatedgroup3expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-isolated-group-3-expected.txt (166524 => 166525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-isolated-group-3-expected.txt 2014-03-31 21:04:03 UTC (rev 166524)
+++ trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-isolated-group-3-expected.txt 2014-03-31 21:06:48 UTC (rev 166525)
</span><span class="lines">@@ -1,51 +1,51 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderView at (0,0) size 800x600
</span><span class="cx"> layer at (0,0) size 800x208 layerType: background only
</span><del>-layer at (28,28) size 60x60
</del><ins>+layer at (28,28) size 60x60 isolatesBlending
</ins><span class="cx"> RenderBlock (floating) zI: -1 {DIV} at (20,20) size 60x60 [bgcolor=#EE82EE]
</span><del>-layer at (48,48) size 60x60
</del><ins>+layer at (48,48) size 60x60 blendMode: multiply
</ins><span class="cx"> RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000]
</span><span class="cx"> layer at (68,68) size 60x60
</span><span class="cx"> RenderBlock (positioned) {DIV} at (40,40) size 60x60 [bgcolor=#FFA500]
</span><span class="cx"> layer at (128,28) size 60x60
</span><span class="cx"> RenderBlock (floating) zI: -1 {DIV} at (120,20) size 60x60 [bgcolor=#EE82EE]
</span><del>-layer at (148,48) size 60x60
</del><ins>+layer at (148,48) size 60x60 blendMode: multiply
</ins><span class="cx"> RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000]
</span><span class="cx"> layer at (168,68) size 60x60
</span><span class="cx"> RenderBlock (positioned) {DIV} at (40,40) size 60x60 [bgcolor=#FFA500]
</span><span class="cx"> layer at (228,28) size 60x60
</span><span class="cx"> RenderBlock (floating) zI: -1 {DIV} at (220,20) size 60x60 [bgcolor=#EE82EE]
</span><del>-layer at (248,48) size 60x60
</del><ins>+layer at (248,48) size 60x60 blendMode: multiply
</ins><span class="cx"> RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000]
</span><span class="cx"> layer at (268,68) size 60x60
</span><span class="cx"> RenderBlock (positioned) {DIV} at (20,20) size 60x60 [bgcolor=#FFA500]
</span><span class="cx"> layer at (328,28) size 60x60
</span><span class="cx"> RenderBlock (floating) zI: -1 {DIV} at (320,20) size 60x60 [bgcolor=#EE82EE]
</span><del>-layer at (348,48) size 60x60
</del><ins>+layer at (348,48) size 60x60 blendMode: multiply
</ins><span class="cx"> RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000]
</span><span class="cx"> layer at (368,68) size 60x60
</span><span class="cx"> RenderBlock (positioned) {DIV} at (20,20) size 60x60 [bgcolor=#FFA500]
</span><del>-layer at (428,28) size 60x60
</del><ins>+layer at (428,28) size 60x60 isolatesBlending
</ins><span class="cx"> RenderBlock (floating) zI: -1 {DIV} at (420,20) size 60x60 [bgcolor=#EE82EE]
</span><del>-layer at (448,48) size 60x60
</del><ins>+layer at (448,48) size 60x60 blendMode: multiply
</ins><span class="cx"> RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000]
</span><span class="cx"> layer at (468,68) size 60x60
</span><span class="cx"> RenderBlock (positioned) {DIV} at (40,40) size 60x60 [bgcolor=#FFA500]
</span><span class="cx"> layer at (528,28) size 60x60
</span><span class="cx"> RenderBlock (floating) zI: -1 {DIV} at (520,20) size 60x60 [bgcolor=#EE82EE]
</span><del>-layer at (548,48) size 60x60
</del><ins>+layer at (548,48) size 60x60 blendMode: multiply
</ins><span class="cx"> RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000]
</span><span class="cx"> layer at (568,68) size 60x60
</span><span class="cx"> RenderBlock (positioned) {DIV} at (40,40) size 60x60 [bgcolor=#FFA500]
</span><span class="cx"> layer at (628,28) size 60x60
</span><span class="cx"> RenderBlock (floating) zI: -1 {DIV} at (620,20) size 60x60 [bgcolor=#EE82EE]
</span><del>-layer at (648,48) size 60x60
</del><ins>+layer at (648,48) size 60x60 blendMode: multiply
</ins><span class="cx"> RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000]
</span><span class="cx"> layer at (668,68) size 60x60
</span><span class="cx"> RenderBlock (positioned) {DIV} at (20,20) size 60x60 [bgcolor=#FFA500]
</span><span class="cx"> layer at (28,128) size 60x60
</span><span class="cx"> RenderBlock (floating) zI: -1 {DIV} at (20,120) size 60x60 [bgcolor=#EE82EE]
</span><del>-layer at (48,148) size 60x60
</del><ins>+layer at (48,148) size 60x60 blendMode: multiply
</ins><span class="cx"> RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000]
</span><span class="cx"> layer at (68,168) size 60x60
</span><span class="cx"> RenderBlock (positioned) {DIV} at (20,20) size 60x60 [bgcolor=#FFA500]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodelayersexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-layers-expected.txt (166524 => 166525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-layers-expected.txt 2014-03-31 21:04:03 UTC (rev 166524)
+++ trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-layers-expected.txt 2014-03-31 21:06:48 UTC (rev 166525)
</span><span class="lines">@@ -17,11 +17,11 @@
</span><span class="cx"> RenderBlock (relative positioned) {DIV} at (0,0) size 160x160
</span><span class="cx"> layer at (53,41) size 80x150
</span><span class="cx"> RenderBlock (relative positioned) {DIV} at (0,0) size 80x150 [bgcolor=#FFFF00]
</span><del>-layer at (243,31) size 160x160
</del><ins>+layer at (243,31) size 160x160 blendMode: multiply
</ins><span class="cx"> RenderBlock (relative positioned) {DIV} at (0,0) size 160x160
</span><span class="cx"> layer at (223,41) size 80x150
</span><span class="cx"> RenderBlock (relative positioned) {DIV} at (0,0) size 80x150 [bgcolor=#FFFF00]
</span><del>-layer at (413,31) size 160x160
</del><ins>+layer at (413,31) size 160x160 blendMode: multiply
</ins><span class="cx"> RenderBlock (relative positioned) {DIV} at (0,0) size 160x160
</span><span class="cx"> layer at (393,41) size 80x150
</span><span class="cx"> RenderBlock (relative positioned) {DIV} at (0,0) size 80x150 [bgcolor=#FFFF00]
</span><span class="lines">@@ -31,15 +31,15 @@
</span><span class="cx"> RenderBlock (relative positioned) {DIV} at (0,0) size 160x160
</span><span class="cx"> layer at (563,41) size 80x150
</span><span class="cx"> RenderBlock (relative positioned) {DIV} at (0,0) size 80x150 [bgcolor=#FFFF00]
</span><del>-layer at (53,246) size 160x75
</del><ins>+layer at (53,246) size 160x75 isolatesBlending
</ins><span class="cx"> RenderBlock {DIV} at (0,50) size 160x75 [bgcolor=#00FFFF]
</span><del>-layer at (73,206) size 160x160
</del><ins>+layer at (73,206) size 160x160 blendMode: multiply
</ins><span class="cx"> RenderBlock (relative positioned) {DIV} at (0,0) size 160x160
</span><span class="cx"> layer at (53,216) size 80x150
</span><span class="cx"> RenderBlock (relative positioned) {DIV} at (0,0) size 80x150 [bgcolor=#FFFF00]
</span><span class="cx"> layer at (223,246) size 160x75
</span><span class="cx"> RenderBlock {DIV} at (0,50) size 160x75 [bgcolor=#00FFFF]
</span><del>-layer at (243,206) size 160x160
</del><ins>+layer at (243,206) size 160x160 blendMode: multiply
</ins><span class="cx"> RenderBlock (relative positioned) {DIV} at (0,0) size 160x160
</span><span class="cx"> layer at (223,216) size 80x150
</span><span class="cx"> RenderBlock (relative positioned) {DIV} at (0,0) size 80x150 [bgcolor=#FFFF00]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodereflectionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-reflection-expected.txt (166524 => 166525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-reflection-expected.txt 2014-03-31 21:04:03 UTC (rev 166524)
+++ trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-reflection-expected.txt 2014-03-31 21:06:48 UTC (rev 166525)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> RenderBlock (floating) {LI} at (45,5) size 130x260
</span><span class="cx"> RenderBlock {UL} at (0,0) size 784x0
</span><span class="cx"> RenderBlock (floating) {LI} at (185,5) size 130x260
</span><del>-layer at (53,21) size 130x130
</del><ins>+layer at (53,21) size 130x130 blendMode: multiply
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (193,21) size 130x130
</del><ins>+layer at (193,21) size 130x130 blendMode: multiply
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodesimplecompositedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-composited-expected.txt (166524 => 166525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-composited-expected.txt 2014-03-31 21:04:03 UTC (rev 166524)
+++ trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-composited-expected.txt 2014-03-31 21:06:48 UTC (rev 166525)
</span><span class="lines">@@ -22,33 +22,33 @@
</span><span class="cx"> RenderBlock (floating) {LI} at (45,425) size 130x130
</span><span class="cx"> layer at (53,21) size 130x130
</span><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (193,21) size 130x130
</del><ins>+layer at (193,21) size 130x130 blendMode: overlay
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (333,21) size 130x130
</del><ins>+layer at (333,21) size 130x130 blendMode: screen
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (473,21) size 130x130
</del><ins>+layer at (473,21) size 130x130 blendMode: overlay
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (613,21) size 130x130
</del><ins>+layer at (613,21) size 130x130 blendMode: darken
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (53,161) size 130x130
</del><ins>+layer at (53,161) size 130x130 blendMode: lighten
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (193,161) size 130x130
</del><ins>+layer at (193,161) size 130x130 blendMode: color-dodge
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (333,161) size 130x130
</del><ins>+layer at (333,161) size 130x130 blendMode: color-burn
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (473,161) size 130x130
</del><ins>+layer at (473,161) size 130x130 blendMode: hard-light
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (613,161) size 130x130
</del><ins>+layer at (613,161) size 130x130 blendMode: soft-light
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (53,301) size 130x130
</del><ins>+layer at (53,301) size 130x130 blendMode: difference
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (193,301) size 130x130
</del><ins>+layer at (193,301) size 130x130 blendMode: exclusion
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (333,301) size 130x130
</del><ins>+layer at (333,301) size 130x130 blendMode: hue
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (473,301) size 130x130
</del><ins>+layer at (473,301) size 130x130 blendMode: saturation
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (613,301) size 130x130
</del><ins>+layer at (613,301) size 130x130 blendMode: color
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (53,441) size 130x130
</del><ins>+layer at (53,441) size 130x130 blendMode: luminosity
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodesimpleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-expected.txt (166524 => 166525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-expected.txt 2014-03-31 21:04:03 UTC (rev 166524)
+++ trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-expected.txt 2014-03-31 21:06:48 UTC (rev 166525)
</span><span class="lines">@@ -21,33 +21,33 @@
</span><span class="cx"> RenderBlock (floating) {LI} at (465,285) size 130x130
</span><span class="cx"> RenderBlock (floating) {LI} at (605,285) size 130x130
</span><span class="cx"> RenderBlock (floating) {LI} at (45,425) size 130x130
</span><del>-layer at (193,21) size 130x130
</del><ins>+layer at (193,21) size 130x130 blendMode: overlay
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (333,21) size 130x130
</del><ins>+layer at (333,21) size 130x130 blendMode: screen
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (473,21) size 130x130
</del><ins>+layer at (473,21) size 130x130 blendMode: overlay
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (613,21) size 130x130
</del><ins>+layer at (613,21) size 130x130 blendMode: darken
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (53,161) size 130x130
</del><ins>+layer at (53,161) size 130x130 blendMode: lighten
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (193,161) size 130x130
</del><ins>+layer at (193,161) size 130x130 blendMode: color-dodge
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (333,161) size 130x130
</del><ins>+layer at (333,161) size 130x130 blendMode: color-burn
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (473,161) size 130x130
</del><ins>+layer at (473,161) size 130x130 blendMode: hard-light
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (613,161) size 130x130
</del><ins>+layer at (613,161) size 130x130 blendMode: soft-light
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (53,301) size 130x130
</del><ins>+layer at (53,301) size 130x130 blendMode: difference
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (193,301) size 130x130
</del><ins>+layer at (193,301) size 130x130 blendMode: exclusion
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (333,301) size 130x130
</del><ins>+layer at (333,301) size 130x130 blendMode: hue
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (473,301) size 130x130
</del><ins>+layer at (473,301) size 130x130 blendMode: saturation
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (613,301) size 130x130
</del><ins>+layer at (613,301) size 130x130 blendMode: color
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><del>-layer at (53,441) size 130x130
</del><ins>+layer at (53,441) size 130x130 blendMode: luminosity
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166524 => 166525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-31 21:04:03 UTC (rev 166524)
+++ trunk/Source/WebCore/ChangeLog 2014-03-31 21:06:48 UTC (rev 166525)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-31 Ion Rosca <rosca@adobe.com>
+
+ [CSS Blending] showLayerTree should dump layer's blend mode and isolation properties
+ https://bugs.webkit.org/show_bug.cgi?id=130922
+
+ Reviewed by Simon Fraser.
+
+ This change only updates existing tests involving blending. No new test required,
+ as there is no new or changed functionality.
+
+ * rendering/RenderLayer.h: adding blendMode() getter.
+ * rendering/RenderTreeAsText.cpp:
+ (WebCore::write):
+ adding blendMode property and layer's isolation status (does layer isolate blending descendants or not?).
+
</ins><span class="cx"> 2014-03-31 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> CSS JIT: clean up the functions ending when generating a checker with context
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (166524 => 166525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2014-03-31 21:04:03 UTC (rev 166524)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2014-03-31 21:06:48 UTC (rev 166525)
</span><span class="lines">@@ -786,6 +786,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_COMPOSITING)
+ BlendMode blendMode() const { return m_blendMode; }
+#endif
+
</ins><span class="cx"> bool isolatesBlending() const
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTreeAsTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTreeAsText.cpp (166524 => 166525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2014-03-31 21:04:03 UTC (rev 166524)
+++ trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2014-03-31 21:06:48 UTC (rev 166525)
</span><span class="lines">@@ -637,6 +637,13 @@
</span><span class="cx"> if (l.isComposited())
</span><span class="cx"> ts << " (composited, bounds=" << l.backing()->compositedBounds() << ", drawsContent=" << l.backing()->graphicsLayer()->drawsContent() << ", paints into ancestor=" << l.backing()->paintsIntoCompositedAncestor() << ")";
</span><span class="cx"> }
</span><ins>+
+#if ENABLE(CSS_COMPOSITING)
+ if (l.isolatesBlending())
+ ts << " isolatesBlending";
+ if (l.hasBlendMode())
+ ts << " blendMode: " << compositeOperatorName(CompositeSourceOver, l.blendMode());
+#endif
</ins><span class="cx">
</span><span class="cx"> ts << "\n";
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>