<!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>[163955] 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/163955">163955</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-12 04:40:08 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Element Blending] Implement the software path of -webkit-blend-mode with Core Graphics.
https://bugs.webkit.org/show_bug.cgi?id=99119
Patch by Mihai Tica <mitica@adobe.com> on 2014-02-12
Reviewed by Simon Fraser.
Source/WebCore:
This patch adds support for -webkit-blend-mode with Core Graphics.
The layer promotion code that forced compositing when blending was detected has been removed.
Remaining work for the software path is to detect and implement isolation of the blending operation:
as stated in the spec, blending should be limited to the parent stacking context.
Tests: css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer.html
css3/compositing/blend-mode-parent-of-composited-blended-has-layer.html
css3/compositing/blend-mode-simple-composited.html
css3/compositing/blend-mode-with-composited-descendant-should-have-layer.html
* inspector/InspectorLayerTreeAgent.cpp:
(WebCore::InspectorLayerTreeAgent::reasonsForCompositingLayer): Remove CompositingReasonBlending.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::beginTransparencyLayers): Set the blendMode on the GraphicsContext.
* rendering/RenderLayer.h: paintsWithTransparency should return true when a blendMode is set.
* rendering/RenderLayerCompositor.cpp: Remove promotion code when a blendMode is detected.
(WebCore::RenderLayerCompositor::requiresCompositingLayer): Remove CompositingReasonBlending reason.
(WebCore::RenderLayerCompositor::requiresOwnBackingStore): Remove CompositingReasonBlending reason.
(WebCore::RenderLayerCompositor::reasonsForCompositing): Remove CompositingReasonBlending reason.
(WebCore::RenderLayerCompositor::logReasonsForCompositing): Remove CompositingReasonBlending reason.
* rendering/RenderLayerCompositor.h:
- Remove the requiresCompositingForBlending method
- Remove the CompositingReasonBlending from the CompositingReasons enum.
LayoutTests:
* css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer-expected.txt: Copied from LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer-expected.txt.
* css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer.html: Test if having an overlapping composited sibling forces compositing of a blended element.
* css3/compositing/blend-mode-layers.html: Update to test both the software and the hardware path.
* css3/compositing/blend-mode-parent-of-composited-blended-has-layer-expected.txt: Renamed from LayoutTests/css3/compositing/should-have-compositing-layer-expected.txt.
* css3/compositing/blend-mode-parent-of-composited-blended-has-layer.html: Test if the parent of an accelerated element with -webkit-blend-mode is promoted.
* css3/compositing/blend-mode-reflection.html: Update to test both the software and the hardware path.
* css3/compositing/blend-mode-should-not-have-compositing-layer.html: Removed.
* css3/compositing/blend-mode-simple-composited.html: Test all the blend modes for the hardware path.
* css3/compositing/blend-mode-with-composited-descendant-should-have-layer-expected.txt: Renamed from LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer-expected.txt.
* css3/compositing/blend-mode-with-composited-descendant-should-have-layer.html: Test to ensure that an element with -webkit-blend-mode and a composited descendant is also accelerated.
* css3/compositing/should-have-compositing-layer.html: Removed.
* platform/mac/css3/compositing/blend-mode-layers-expected.png:
* platform/mac/css3/compositing/blend-mode-layers-expected.txt:
* platform/mac/css3/compositing/blend-mode-overflow-expected.png:
* platform/mac/css3/compositing/blend-mode-overflow-expected.txt: Added.
* platform/mac/css3/compositing/blend-mode-reflection-expected.png:
* platform/mac/css3/compositing/blend-mode-reflection-expected.txt:
* platform/mac/css3/compositing/blend-mode-simple-composited-expected.png: Added.
* platform/mac/css3/compositing/blend-mode-simple-composited-expected.txt: Added.
* platform/mac/css3/compositing/blend-mode-simple-expected.png:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3compositingblendmodelayershtml">trunk/LayoutTests/css3/compositing/blend-mode-layers.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingblendmodereflectionhtml">trunk/LayoutTests/css3/compositing/blend-mode-reflection.html</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingblendmodelayersexpectedpng">trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-layers-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingblendmodelayersexpectedtxt">trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-layers-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingblendmodeoverflowexpectedpng">trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-overflow-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingblendmodereflectionexpectedpng">trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-reflection-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingblendmodereflectionexpectedtxt">trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-reflection-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingblendmodesimpleexpectedpng">trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-expected.png</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorLayerTreeAgentcpp">trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp</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="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorh">trunk/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3compositingblendmodeblendedelementoverlappingcompositedsiblingshouldhavecompositinglayerexpectedtxt">trunk/LayoutTests/css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3compositingblendmodeblendedelementoverlappingcompositedsiblingshouldhavecompositinglayerhtml">trunk/LayoutTests/css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingblendmodeparentofcompositedblendedhaslayerexpectedtxt">trunk/LayoutTests/css3/compositing/blend-mode-parent-of-composited-blended-has-layer-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3compositingblendmodeparentofcompositedblendedhaslayerhtml">trunk/LayoutTests/css3/compositing/blend-mode-parent-of-composited-blended-has-layer.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingblendmodesimplecompositedhtml">trunk/LayoutTests/css3/compositing/blend-mode-simple-composited.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingblendmodewithcompositeddescendantshouldhavelayerexpectedtxt">trunk/LayoutTests/css3/compositing/blend-mode-with-composited-descendant-should-have-layer-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3compositingblendmodewithcompositeddescendantshouldhavelayerhtml">trunk/LayoutTests/css3/compositing/blend-mode-with-composited-descendant-should-have-layer.html</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingblendmodeoverflowexpectedtxt">trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-overflow-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingblendmodesimplecompositedexpectedpng">trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-composited-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingblendmodesimplecompositedexpectedtxt">trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-composited-expected.txt</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3compositingblendmodeshouldnothavecompositinglayerexpectedtxt">trunk/LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3compositingblendmodeshouldnothavecompositinglayerhtml">trunk/LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingshouldhavecompositinglayerexpectedtxt">trunk/LayoutTests/css3/compositing/should-have-compositing-layer-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3compositingshouldhavecompositinglayerhtml">trunk/LayoutTests/css3/compositing/should-have-compositing-layer.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163954 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-12 12:17:41 UTC (rev 163954)
+++ trunk/LayoutTests/ChangeLog 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-02-12 Mihai Tica <mitica@adobe.com>
+
+ [CSS Element Blending] Implement the software path of -webkit-blend-mode with Core Graphics.
+ https://bugs.webkit.org/show_bug.cgi?id=99119
+
+ Reviewed by Simon Fraser.
+
+ * css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer-expected.txt: Copied from LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer-expected.txt.
+ * css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer.html: Test if having an overlapping composited sibling forces compositing of a blended element.
+ * css3/compositing/blend-mode-layers.html: Update to test both the software and the hardware path.
+ * css3/compositing/blend-mode-parent-of-composited-blended-has-layer-expected.txt: Renamed from LayoutTests/css3/compositing/should-have-compositing-layer-expected.txt.
+ * css3/compositing/blend-mode-parent-of-composited-blended-has-layer.html: Test if the parent of an accelerated element with -webkit-blend-mode is promoted.
+ * css3/compositing/blend-mode-reflection.html: Update to test both the software and the hardware path.
+ * css3/compositing/blend-mode-should-not-have-compositing-layer.html: Removed.
+ * css3/compositing/blend-mode-simple-composited.html: Test all the blend modes for the hardware path.
+ * css3/compositing/blend-mode-with-composited-descendant-should-have-layer-expected.txt: Renamed from LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer-expected.txt.
+ * css3/compositing/blend-mode-with-composited-descendant-should-have-layer.html: Test to ensure that an element with -webkit-blend-mode and a composited descendant is also accelerated.
+ * css3/compositing/should-have-compositing-layer.html: Removed.
+ * platform/mac/css3/compositing/blend-mode-layers-expected.png:
+ * platform/mac/css3/compositing/blend-mode-layers-expected.txt:
+ * platform/mac/css3/compositing/blend-mode-overflow-expected.png:
+ * platform/mac/css3/compositing/blend-mode-overflow-expected.txt: Added.
+ * platform/mac/css3/compositing/blend-mode-reflection-expected.png:
+ * platform/mac/css3/compositing/blend-mode-reflection-expected.txt:
+ * platform/mac/css3/compositing/blend-mode-simple-composited-expected.png: Added.
+ * platform/mac/css3/compositing/blend-mode-simple-composited-expected.txt: Added.
+ * platform/mac/css3/compositing/blend-mode-simple-expected.png:
+
</ins><span class="cx"> 2014-02-12 Michał Pakuła vel Rutka <m.pakula@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed EFL gatdening
</span></span></pre></div>
<a id="trunkLayoutTestscss3compositingblendmodeblendedelementoverlappingcompositedsiblingshouldhavecompositinglayerexpectedtxtfromrev163954trunkLayoutTestscss3compositingblendmodeshouldnothavecompositinglayerexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer-expected.txt (from rev 163954, trunk/LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer-expected.txt) (0 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer-expected.txt 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -0,0 +1,26 @@
</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 2
+ (GraphicsLayer
+ (position 8.00 8.00)
+ (bounds 100.00 100.00)
+ )
+ (GraphicsLayer
+ (position 8.00 78.00)
+ (bounds 100.00 100.00)
+ )
+ )
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingblendmodeblendedelementoverlappingcompositedsiblingshouldhavecompositinglayerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer.html (0 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer.html 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE HTML-->
+
+<style>
+ div {
+ width: 100px;
+ height: 100px;
+ }
+
+ .composited_sibling {
+ -webkit-transform: translateZ(0);
+ }
+
+ .blender {
+ margin-top: -30px;
+ -webkit-blend-mode: difference;
+ }
+</style>
+
+<div class="composited_sibling"></div>
+<div class="blender"></div>
+<pre id="layerTree"></pre>
+<script>
+ if (window.testRunner)
+ window.testRunner.dumpAsText();
+
+ var text = document.getElementById("layerTree");
+ text.innerHTML = window.internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_REPAINT_RECTS);
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingblendmodelayershtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/compositing/blend-mode-layers.html (163954 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-layers.html 2014-02-12 12:17:41 UTC (rev 163954)
+++ trunk/LayoutTests/css3/compositing/blend-mode-layers.html 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -46,6 +46,10 @@
</span><span class="cx"> display: block;
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><ins>+
+ .composited {
+ -webkit-transform: translateZ(0);
+ }
</ins><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx">
</span><span class="lines">@@ -57,11 +61,13 @@
</span><span class="cx">
</span><span class="cx"> <!-- setting the blendmode will create a new stacking context which causes z-index to change -->
</span><span class="cx"> <li><div class="div1"><div class="div2" style="-webkit-blend-mode: multiply"><div class="div3"></div></div></div></li>
</span><ins>+ <li><div class="div1"><div class="div2 composited" style="-webkit-blend-mode: multiply"><div class="div3"></div></div></div></li>
</ins><span class="cx">
</span><span class="cx"> <!-- just setting slight opacity which causes a stacking context. This also causes z-index to be resolved to the stacking context -->
</span><span class="cx"> <li><div class="div1" style="opacity:.99"><div class="div2"><div class="div3"></div></div></div></li>
</span><span class="cx">
</span><span class="cx"> <!-- blending will now only happen upto the stacking context generated by opacity. Z-index is resolved against the stacking context of the div with the blendmode -->
</span><span class="cx"> <li><div class="div1" style="opacity:.99"><div class="div2" style="-webkit-blend-mode: multiply"><div class="div3"></div></div></div></li>
</span><ins>+ <li><div class="div1" style="opacity:.99"><div class="div2 composited" style="-webkit-blend-mode: multiply"><div class="div3"></div></div></div></li>
</ins><span class="cx"> </ul>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestscss3compositingblendmodeparentofcompositedblendedhaslayerexpectedtxtfromrev163954trunkLayoutTestscss3compositingshouldhavecompositinglayerexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/css3/compositing/blend-mode-parent-of-composited-blended-has-layer-expected.txt (from rev 163954, trunk/LayoutTests/css3/compositing/should-have-compositing-layer-expected.txt) (0 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-parent-of-composited-blended-has-layer-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/compositing/blend-mode-parent-of-composited-blended-has-layer-expected.txt 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -0,0 +1,22 @@
</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 18.00 10.00)
+ (bounds 100.00 100.00)
+ )
+ )
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingblendmodeparentofcompositedblendedhaslayerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/blend-mode-parent-of-composited-blended-has-layer.html (0 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-parent-of-composited-blended-has-layer.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/blend-mode-parent-of-composited-blended-has-layer.html 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE HTML>
+<!-- Test if the parent of a composited layer with mix-blend-mode is promoted. -->
+
+<style>
+ div {
+ width: 100px;
+ height: 100px;
+ }
+ .blender {
+ -webkit-blend-mode: difference;
+ -webkit-transform: translateZ(0);
+ margin: 10px;
+ }
+</style>
+
+<div><div class="blender"></div></div>
+<pre id="layerTree"></pre>
+<script>
+ if (window.testRunner)
+ window.testRunner.dumpAsText();
+
+ var text = document.getElementById("layerTree");
+ text.innerHTML = window.internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_REPAINT_RECTS);
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingblendmodereflectionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/compositing/blend-mode-reflection.html (163954 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-reflection.html 2014-02-12 12:17:41 UTC (rev 163954)
+++ trunk/LayoutTests/css3/compositing/blend-mode-reflection.html 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -20,11 +20,16 @@
</span><span class="cx"> display: block;
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><ins>+
+ .composited {
+ -webkit-transform: translateZ(0);
+ }
</ins><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx">
</span><del>-<!-- This file should contain a duck on top of a gradient that has a reflection.
</del><ins>+<!-- This file should contain two images of a duck on top of a gradient with reflection.
</ins><span class="cx"> Both the duck and the reflection should blend. -->
</span><span class="cx"> <body>
</span><span class="cx"> <ul><li><img style="-webkit-blend-mode: multiply" src="resources/ducky.png"></li></ul>
</span><ins>+ <ul><li><img class="composited" style="-webkit-blend-mode: multiply" src="resources/ducky.png"></li></ul>
</ins><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestscss3compositingblendmodeshouldnothavecompositinglayerexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer-expected.txt (163954 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer-expected.txt 2014-02-12 12:17:41 UTC (rev 163954)
+++ trunk/LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer-expected.txt 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-
-(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 784.00 90.00)
- (opacity 0.50)
- (drawsContent 1)
- (children 1
- (GraphicsLayer
- (bounds 160.00 90.00)
- )
- )
- )
- )
- )
- )
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestscss3compositingblendmodeshouldnothavecompositinglayerhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer.html (163954 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer.html 2014-02-12 12:17:41 UTC (rev 163954)
+++ trunk/LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer.html 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -1,22 +0,0 @@
</span><del>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
- <script src="../../fast/js/resources/js-test-pre.js"></script>
-</head>
-<body>
- <script>
- window.addEventListener('load', function() {
- if (window.testRunner) {
- testRunner.dumpAsText(false);
- var text = document.getElementById('text');
- text.innerHTML = window.internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_REPAINT_RECTS);
- }
- });
- </script>
-
- <div style="opacity: .5">
- <img style="-webkit-blend-mode: multiply;" src="resources/reference.png">
- </div>
- <pre id="text"></pre>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestscss3compositingblendmodesimplecompositedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/blend-mode-simple-composited.html (0 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-simple-composited.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/blend-mode-simple-composited.html 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+<!DOCTYPE HTML>
+<head>
+ <script>
+ if (window.testRunner)
+ window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "1");
+ </script>
+
+ <style>
+ img {
+ width: 130px;
+ height: 130px;
+ -webkit-transform: translateZ(0);
+ }
+
+ li {
+ margin: 5px;
+ width: 130px;
+ height: 130px;
+ background: -webkit-gradient(linear, left top, right top, color-stop(0%,#0ff), color-stop(24%,#00f), color-stop(50%,#f00), color-stop(75%,#ff0), color-stop(100%,#0f0));
+ display: block;
+ float: left;
+ }
+ </style>
+</head>
+
+<!-- This file should contain a duck on top of a gradient with every type of blending. -->
+<body>
+ <ul>
+ <!-- Separable blend modes -->
+ <li><img style="-webkit-blend-mode: normal" src="resources/ducky.png"></li>
+ <li><img style="-webkit-blend-mode: overlay" src="resources/ducky.png"></li>
+ <li><img style="-webkit-blend-mode: screen" src="resources/ducky.png"></li>
+ <li><img style="-webkit-blend-mode: overlay" src="resources/ducky.png"></li>
+ <li><img style="-webkit-blend-mode: darken" src="resources/ducky.png"></li>
+ <li><img style="-webkit-blend-mode: lighten" src="resources/ducky.png"></li>
+ <li><img style="-webkit-blend-mode: color-dodge" src="resources/ducky.png"></li>
+ <li><img style="-webkit-blend-mode: color-burn" src="resources/ducky.png"></li>
+ <li><img style="-webkit-blend-mode: hard-light" src="resources/ducky.png"></li>
+ <li><img style="-webkit-blend-mode: soft-light" src="resources/ducky.png"></li>
+ <li><img style="-webkit-blend-mode: difference" src="resources/ducky.png"></li>
+ <li><img style="-webkit-blend-mode: exclusion" src="resources/ducky.png"></li>
+ <!-- Non separable blend modes -->
+ <li><img style="-webkit-blend-mode: hue" src="resources/ducky.png"></li>
+ <li><img style="-webkit-blend-mode: saturation" src="resources/ducky.png"></li>
+ <li><img style="-webkit-blend-mode: color" src="resources/ducky.png"></li>
+ <li><img style="-webkit-blend-mode: luminosity" src="resources/ducky.png"></li>
+ </ul>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingblendmodewithcompositeddescendantshouldhavelayerexpectedtxtfromrev163954trunkLayoutTestscss3compositingblendmodeshouldnothavecompositinglayerexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/css3/compositing/blend-mode-with-composited-descendant-should-have-layer-expected.txt (from rev 163954, trunk/LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer-expected.txt) (0 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-with-composited-descendant-should-have-layer-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/compositing/blend-mode-with-composited-descendant-should-have-layer-expected.txt 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -0,0 +1,28 @@
</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 10.00)
+ (bounds 100.00 100.00)
+ (children 1
+ (GraphicsLayer
+ (position 10.00 0.00)
+ (bounds 100.00 100.00)
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingblendmodewithcompositeddescendantshouldhavelayerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/blend-mode-with-composited-descendant-should-have-layer.html (0 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-with-composited-descendant-should-have-layer.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/blend-mode-with-composited-descendant-should-have-layer.html 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE HTML>
+<!-- Test if an element with mix-blend-mode having a composited descendant is promoted. -->
+
+<style>
+ div {
+ width: 100px;
+ height: 100px;
+ }
+ .blender {
+ -webkit-blend-mode: difference;
+ }
+ .child {
+ -webkit-transform: translateZ(0);
+ margin: 10px;
+ }
+</style>
+
+<div class="blender"><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, internals.LAYER_TREE_INCLUDES_REPAINT_RECTS);
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingshouldhavecompositinglayerexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/css3/compositing/should-have-compositing-layer-expected.txt (163954 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/should-have-compositing-layer-expected.txt 2014-02-12 12:17:41 UTC (rev 163954)
+++ trunk/LayoutTests/css3/compositing/should-have-compositing-layer-expected.txt 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-Test to make sure a blend mode creates a compositing layer. Test is successful of render tree shows compositing
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS content has compositing layers
-
-(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 76.00)
- (bounds 160.00 90.00)
- )
- )
- )
- )
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestscss3compositingshouldhavecompositinglayerhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/css3/compositing/should-have-compositing-layer.html (163954 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/should-have-compositing-layer.html 2014-02-12 12:17:41 UTC (rev 163954)
+++ trunk/LayoutTests/css3/compositing/should-have-compositing-layer.html 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src="../../resources/js-test-pre.js"></script>
-</head>
-<script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
-
- function doTest()
- {
- description("Test to make sure a blend mode creates a compositing layer. Test is successful of render tree shows compositing");
- if (window.testRunner) {
- var layers = window.internals.layerTreeAsText(document);
- if (layers == "")
- testFailed("no compositing layers");
- else
- testPassed("content has compositing layers");
- document.getElementById("layertree").innerText = layers;
- testRunner.notifyDone();
- }
- }
-
- window.addEventListener('load', doTest, false);
-
-</script>
-<img style="-webkit-blend-mode: multiply;" src="resources/reference.png">
-<pre id="layertree"></pre>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodelayersexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-layers-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodelayersexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-layers-expected.txt (163954 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-layers-expected.txt 2014-02-12 12:17:41 UTC (rev 163954)
+++ trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-layers-expected.txt 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderView at (0,0) size 800x600
</span><del>-layer at (0,0) size 800x191
- RenderBlock {HTML} at (0,0) size 800x191
</del><ins>+layer at (0,0) size 800x366
+ RenderBlock {HTML} at (0,0) size 800x366
</ins><span class="cx"> RenderBody {BODY} at (8,16) size 784x0
</span><span class="cx"> RenderBlock {UL} at (0,0) size 784x0
</span><span class="cx"> RenderBlock (floating) {LI} at (45,5) size 160x50 [bgcolor=#FF00FF]
</span><span class="lines">@@ -9,7 +9,10 @@
</span><span class="cx"> RenderBlock (floating) {LI} at (215,5) size 160x50 [bgcolor=#FF00FF]
</span><span class="cx"> RenderBlock {DIV} at (0,50) size 160x75 [bgcolor=#00FFFF]
</span><span class="cx"> RenderBlock (floating) {LI} at (385,5) size 160x50 [bgcolor=#FF00FF]
</span><ins>+ RenderBlock {DIV} at (0,50) size 160x75 [bgcolor=#00FFFF]
</ins><span class="cx"> RenderBlock (floating) {LI} at (555,5) size 160x50 [bgcolor=#FF00FF]
</span><ins>+ RenderBlock (floating) {LI} at (45,180) size 160x50 [bgcolor=#FF00FF]
+ RenderBlock (floating) {LI} at (215,180) size 160x50 [bgcolor=#FF00FF]
</ins><span class="cx"> layer at (73,31) size 160x160
</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="lines">@@ -18,8 +21,6 @@
</span><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 (393,71) size 160x75
- RenderBlock {DIV} at (0,50) size 160x75 [bgcolor=#00FFFF]
</del><span class="cx"> layer at (413,31) size 160x160
</span><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="lines">@@ -30,3 +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><ins>+layer at (53,246) size 160x75
+ RenderBlock {DIV} at (0,50) size 160x75 [bgcolor=#00FFFF]
+layer at (73,206) size 160x160
+ RenderBlock (relative positioned) {DIV} at (0,0) size 160x160
+layer at (53,216) size 80x150
+ RenderBlock (relative positioned) {DIV} at (0,0) size 80x150 [bgcolor=#FFFF00]
+layer at (223,246) size 160x75
+ RenderBlock {DIV} at (0,50) size 160x75 [bgcolor=#00FFFF]
+layer at (243,206) size 160x160
+ RenderBlock (relative positioned) {DIV} at (0,0) size 160x160
+layer at (223,216) size 80x150
+ RenderBlock (relative positioned) {DIV} at (0,0) size 80x150 [bgcolor=#FFFF00]
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodeoverflowexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-overflow-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodeoverflowexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-overflow-expected.txt (0 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-overflow-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-overflow-expected.txt 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+No blending. Duck should be yellow everywhere.
+Simple blending. Duck should be a horizontal rainbow inside, and blue on overflow.
+Parent is a stacking context. Duck should be a horizontal rainbow inside, and yellow on overflow (since there is no background there to blend with).
+Intermediate parent - no stacking context. Duck should be a vertical gradient inside, and blue on overflow.
+Intermediate parent with grandparent stacking context. Duck should be a vertical gradient inside, and yellow on overflow.
+Intermediate parent has overflow. Duck should be a vertical gradient inside, and overflow is hidden.
+
+
+
+
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodereflectionexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-reflection-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodereflectionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-reflection-expected.txt (163954 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-reflection-expected.txt 2014-02-12 12:17:41 UTC (rev 163954)
+++ trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-reflection-expected.txt 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -5,5 +5,9 @@
</span><span class="cx"> RenderBody {BODY} at (8,16) size 784x0
</span><span class="cx"> RenderBlock {UL} at (0,0) size 784x0
</span><span class="cx"> RenderBlock (floating) {LI} at (45,5) size 130x260
</span><ins>+ RenderBlock {UL} at (0,0) size 784x0
+ RenderBlock (floating) {LI} at (185,5) size 130x260
</ins><span class="cx"> layer at (53,21) size 130x130
</span><span class="cx"> RenderImage {IMG} at (0,0) size 130x130
</span><ins>+layer at (193,21) size 130x130
+ RenderImage {IMG} at (0,0) size 130x130
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodesimplecompositedexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-composited-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-composited-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodesimplecompositedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-composited-expected.txt (0 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-composited-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-composited-expected.txt 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x576
+ RenderBlock {HTML} at (0,0) size 800x576
+ RenderBody {BODY} at (8,16) size 784x0
+ RenderBlock {UL} at (0,0) size 784x0
+ RenderBlock (floating) {LI} at (45,5) size 130x130
+ RenderBlock (floating) {LI} at (185,5) size 130x130
+ RenderBlock (floating) {LI} at (325,5) size 130x130
+ RenderBlock (floating) {LI} at (465,5) size 130x130
+ RenderBlock (floating) {LI} at (605,5) size 130x130
+ RenderBlock (floating) {LI} at (45,145) size 130x130
+ RenderBlock (floating) {LI} at (185,145) size 130x130
+ RenderBlock (floating) {LI} at (325,145) size 130x130
+ RenderBlock (floating) {LI} at (465,145) size 130x130
+ RenderBlock (floating) {LI} at (605,145) size 130x130
+ RenderBlock (floating) {LI} at (45,285) size 130x130
+ RenderBlock (floating) {LI} at (185,285) size 130x130
+ RenderBlock (floating) {LI} at (325,285) size 130x130
+ RenderBlock (floating) {LI} at (465,285) size 130x130
+ RenderBlock (floating) {LI} at (605,285) size 130x130
+ RenderBlock (floating) {LI} at (45,425) size 130x130
+layer at (53,21) size 130x130
+ RenderImage {IMG} at (0,0) size 130x130
+layer at (193,21) size 130x130
+ RenderImage {IMG} at (0,0) size 130x130
+layer at (333,21) size 130x130
+ RenderImage {IMG} at (0,0) size 130x130
+layer at (473,21) size 130x130
+ RenderImage {IMG} at (0,0) size 130x130
+layer at (613,21) size 130x130
+ RenderImage {IMG} at (0,0) size 130x130
+layer at (53,161) size 130x130
+ RenderImage {IMG} at (0,0) size 130x130
+layer at (193,161) size 130x130
+ RenderImage {IMG} at (0,0) size 130x130
+layer at (333,161) size 130x130
+ RenderImage {IMG} at (0,0) size 130x130
+layer at (473,161) size 130x130
+ RenderImage {IMG} at (0,0) size 130x130
+layer at (613,161) size 130x130
+ RenderImage {IMG} at (0,0) size 130x130
+layer at (53,301) size 130x130
+ RenderImage {IMG} at (0,0) size 130x130
+layer at (193,301) size 130x130
+ RenderImage {IMG} at (0,0) size 130x130
+layer at (333,301) size 130x130
+ RenderImage {IMG} at (0,0) size 130x130
+layer at (473,301) size 130x130
+ RenderImage {IMG} at (0,0) size 130x130
+layer at (613,301) size 130x130
+ RenderImage {IMG} at (0,0) size 130x130
+layer at (53,441) size 130x130
+ RenderImage {IMG} at (0,0) size 130x130
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodesimpleexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163954 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-12 12:17:41 UTC (rev 163954)
+++ trunk/Source/WebCore/ChangeLog 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-02-12 Mihai Tica <mitica@adobe.com>
+
+ [CSS Element Blending] Implement the software path of -webkit-blend-mode with Core Graphics.
+ https://bugs.webkit.org/show_bug.cgi?id=99119
+
+ Reviewed by Simon Fraser.
+
+ This patch adds support for -webkit-blend-mode with Core Graphics.
+ The layer promotion code that forced compositing when blending was detected has been removed.
+ Remaining work for the software path is to detect and implement isolation of the blending operation:
+ as stated in the spec, blending should be limited to the parent stacking context.
+
+ Tests: css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer.html
+ css3/compositing/blend-mode-parent-of-composited-blended-has-layer.html
+ css3/compositing/blend-mode-simple-composited.html
+ css3/compositing/blend-mode-with-composited-descendant-should-have-layer.html
+
+ * inspector/InspectorLayerTreeAgent.cpp:
+ (WebCore::InspectorLayerTreeAgent::reasonsForCompositingLayer): Remove CompositingReasonBlending.
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::beginTransparencyLayers): Set the blendMode on the GraphicsContext.
+ * rendering/RenderLayer.h: paintsWithTransparency should return true when a blendMode is set.
+ * rendering/RenderLayerCompositor.cpp: Remove promotion code when a blendMode is detected.
+ (WebCore::RenderLayerCompositor::requiresCompositingLayer): Remove CompositingReasonBlending reason.
+ (WebCore::RenderLayerCompositor::requiresOwnBackingStore): Remove CompositingReasonBlending reason.
+ (WebCore::RenderLayerCompositor::reasonsForCompositing): Remove CompositingReasonBlending reason.
+ (WebCore::RenderLayerCompositor::logReasonsForCompositing): Remove CompositingReasonBlending reason.
+ * rendering/RenderLayerCompositor.h:
+ - Remove the requiresCompositingForBlending method
+ - Remove the CompositingReasonBlending from the CompositingReasons enum.
+
</ins><span class="cx"> 2014-02-11 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel rendering: Switch repaint rect from IntRect to LayoutRect to be able to
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorLayerTreeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp (163954 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2014-02-12 12:17:41 UTC (rev 163954)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx">
</span><span class="cx"> if (reasonsBitmask & CompositingReasonFilterWithCompositedDescendants)
</span><span class="cx"> compositingReasons->setFilterWithCompositedDescendants(true);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (reasonsBitmask & CompositingReasonBlendingWithCompositedDescendants)
</span><span class="cx"> compositingReasons->setBlendingWithCompositedDescendants(true);
</span><span class="cx">
</span><span class="lines">@@ -306,9 +306,6 @@
</span><span class="cx">
</span><span class="cx"> if (reasonsBitmask & CompositingReasonRoot)
</span><span class="cx"> compositingReasons->setRoot(true);
</span><del>-
- if (reasonsBitmask & CompositingReasonBlending)
- compositingReasons->setBlending(true);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String InspectorLayerTreeAgent::bind(const RenderLayer* layer)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (163954 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-02-12 12:17:41 UTC (rev 163954)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -1683,7 +1683,19 @@
</span><span class="cx"> context->save();
</span><span class="cx"> LayoutRect clipRect = paintingExtent(rootLayer, paintDirtyRect, paintBehavior);
</span><span class="cx"> context->clip(clipRect);
</span><ins>+
+#if ENABLE(CSS_COMPOSITING)
+ if (hasBlendMode())
+ context->setCompositeOperation(context->compositeOperation(), m_blendMode);
+#endif
+
</ins><span class="cx"> context->beginTransparencyLayer(renderer().opacity());
</span><ins>+
+#if ENABLE(CSS_COMPOSITING)
+ if (hasBlendMode())
+ context->setCompositeOperation(context->compositeOperation(), BlendModeNormal);
+#endif
+
</ins><span class="cx"> #ifdef REVEAL_TRANSPARENCY_LAYERS
</span><span class="cx"> context->setFillColor(Color(0.0f, 0.0f, 0.5f, 0.2f), ColorSpaceDeviceRGB);
</span><span class="cx"> context->fillRect(clipRect);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (163954 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2014-02-12 12:17:41 UTC (rev 163954)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -798,7 +798,7 @@
</span><span class="cx">
</span><span class="cx"> bool paintsWithTransparency(PaintBehavior paintBehavior) const
</span><span class="cx"> {
</span><del>- return isTransparent() && ((paintBehavior & PaintBehaviorFlattenCompositingLayers) || !isComposited());
</del><ins>+ return (isTransparent() || hasBlendMode()) && ((paintBehavior & PaintBehaviorFlattenCompositingLayers) || !isComposited());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool paintsWithTransform(PaintBehavior) const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (163954 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-02-12 12:17:41 UTC (rev 163954)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -1989,8 +1989,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> || requiresCompositingForScrolling(*renderer)
</span><span class="cx"> #endif
</span><del>- || requiresCompositingForOverflowScrolling(*renderer->layer())
- || requiresCompositingForBlending(*renderer);
</del><ins>+ || requiresCompositingForOverflowScrolling(*renderer->layer());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderLayerCompositor::canBeComposited(const RenderLayer& layer) const
</span><span class="lines">@@ -2029,7 +2028,6 @@
</span><span class="cx"> || (canRender3DTransforms() && renderer.style().backfaceVisibility() == BackfaceVisibilityHidden)
</span><span class="cx"> || requiresCompositingForAnimation(renderer)
</span><span class="cx"> || requiresCompositingForFilters(renderer)
</span><del>- || requiresCompositingForBlending(renderer)
</del><span class="cx"> || requiresCompositingForPosition(renderer, layer)
</span><span class="cx"> || requiresCompositingForOverflowScrolling(layer)
</span><span class="cx"> || renderer.isTransparent()
</span><span class="lines">@@ -2093,9 +2091,6 @@
</span><span class="cx"> if (requiresCompositingForFilters(*renderer))
</span><span class="cx"> reasons |= CompositingReasonFilters;
</span><span class="cx">
</span><del>- if (requiresCompositingForBlending(*renderer))
- reasons |= CompositingReasonBlending;
-
</del><span class="cx"> if (requiresCompositingForPosition(*renderer, *renderer->layer()))
</span><span class="cx"> reasons |= renderer->style().position() == FixedPosition ? CompositingReasonPositionFixed : CompositingReasonPositionSticky;
</span><span class="cx">
</span><span class="lines">@@ -2128,9 +2123,10 @@
</span><span class="cx">
</span><span class="cx"> if (renderer->hasFilter())
</span><span class="cx"> reasons |= CompositingReasonFilterWithCompositedDescendants;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (renderer->hasBlendMode())
</span><span class="cx"> reasons |= CompositingReasonBlendingWithCompositedDescendants;
</span><ins>+
</ins><span class="cx"> } else if (renderer->layer()->indirectCompositingReason() == RenderLayer::IndirectCompositingForPerspective)
</span><span class="cx"> reasons |= CompositingReasonPerspective;
</span><span class="cx"> else if (renderer->layer()->indirectCompositingReason() == RenderLayer::IndirectCompositingForPreserve3D)
</span><span class="lines">@@ -2171,9 +2167,6 @@
</span><span class="cx"> if (reasons & CompositingReasonFilters)
</span><span class="cx"> return "filters";
</span><span class="cx">
</span><del>- if (reasons & CompositingReasonBlending)
- return "blending";
-
</del><span class="cx"> if (reasons & CompositingReasonPositionFixed)
</span><span class="cx"> return "position: fixed";
</span><span class="cx">
</span><span class="lines">@@ -2447,16 +2440,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderLayerCompositor::requiresCompositingForBlending(RenderLayerModelObject& renderer) const
-{
-#if ENABLE(CSS_COMPOSITING)
- return renderer.hasBlendMode();
-#else
- UNUSED_PARAM(renderer);
- return false;
-#endif
-}
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> static bool isStickyInAcceleratedScrollingLayerOrViewport(const RenderLayer& layer, const RenderLayer** enclosingAcceleratedOverflowLayer = 0)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (163954 => 163955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-02-12 12:17:41 UTC (rev 163954)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-02-12 12:40:08 UTC (rev 163955)
</span><span class="lines">@@ -80,8 +80,7 @@
</span><span class="cx"> CompositingReasonBlendingWithCompositedDescendants = 1 << 20,
</span><span class="cx"> CompositingReasonPerspective = 1 << 21,
</span><span class="cx"> CompositingReasonPreserve3D = 1 << 22,
</span><del>- CompositingReasonRoot = 1 << 23,
- CompositingReasonBlending = 1 << 24
</del><ins>+ CompositingReasonRoot = 1 << 23
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned CompositingReasons;
</span><span class="cx">
</span><span class="lines">@@ -393,7 +392,6 @@
</span><span class="cx"> bool requiresCompositingForPlugin(RenderLayerModelObject&) const;
</span><span class="cx"> bool requiresCompositingForFrame(RenderLayerModelObject&) const;
</span><span class="cx"> bool requiresCompositingForFilters(RenderLayerModelObject&) const;
</span><del>- bool requiresCompositingForBlending(RenderLayerModelObject&) const;
</del><span class="cx"> bool requiresCompositingForScrollableFrame() const;
</span><span class="cx"> bool requiresCompositingForPosition(RenderLayerModelObject&, const RenderLayer&, RenderLayer::ViewportConstrainedNotCompositedReason* = 0) const;
</span><span class="cx"> bool requiresCompositingForOverflowScrolling(const RenderLayer&) const;
</span></span></pre>
</div>
</div>
</body>
</html>