<!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>[161628] 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/161628">161628</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-10 03:30:12 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for blendmode to Core Animation layer.
Patch by Rik Cabanier, Dean Jackson and Mihai Tica.
https://bugs.webkit.org/show_bug.cgi?id=99200
Patch by Mihai Tica <mitica@adobe.com> on 2014-01-10
Reviewed by Dirk Schulze.
Source/WebCore:
Tests: css3/compositing/blend-mode-layers.html
css3/compositing/blend-mode-overflow.html
css3/compositing/blend-mode-reflection.html
css3/compositing/blend-mode-should-not-have-compositing-layer.html
css3/compositing/blend-mode-simple.html
* WebCore.exp.in: export PlatformCALayer::setBlendMode for WebKit::PlatformCALayerRemote
* WebCore.xcodeproj/project.pbxproj: Add PlatformCAFiltersMac.h
* platform/graphics/GraphicsLayer.cpp: add blendMode member
(WebCore::GraphicsLayer::GraphicsLayer):
* platform/graphics/GraphicsLayer.h:
(WebCore::GraphicsLayer::blendMode):
(WebCore::GraphicsLayer::setBlendMode):
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::setBlendMode):
(WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): add call to updateBlendMode()
(WebCore::GraphicsLayerCA::updateBlendMode):
* platform/graphics/ca/GraphicsLayerCA.h:
* platform/graphics/ca/PlatformCAFilters.h:
* platform/graphics/ca/PlatformCALayer.h:
* platform/graphics/ca/mac/PlatformCAFiltersMac.h: Added.
* platform/graphics/ca/mac/PlatformCAFiltersMac.mm:
(PlatformCAFilters::setBlendingFiltersOnLayer): set a compositing CAFilter on CALayer
* platform/graphics/ca/mac/PlatformCALayerMac.mm:
(PlatformCALayer::setBlendMode): call to PlatformCAFilters::setBlendingFiltersOnLayer
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
(WebCore::RenderLayerBacking::updateBlendMode):
(WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
(WebCore::RenderLayerBacking::setBlendMode):
* rendering/RenderLayerBacking.h:
* rendering/RenderLayerCompositor.cpp:
(WebCore::CompositingState::CompositingState): add m_subtreeHasBlending member
(WebCore::RenderLayerCompositor::computeCompositingRequirements): promote layer if subtree has blending
(WebCore::RenderLayerCompositor::reasonsForCompositing):
(WebCore::RenderLayerCompositor::logReasonsForCompositing): log blending reason
(WebCore::RenderLayerCompositor::requiresCompositingForIndirectReason): add blending reason
* rendering/RenderLayerCompositor.h:
LayoutTests:
* css3/compositing/blend-mode-layers.html: Added.
* css3/compositing/blend-mode-overflow-expected.txt: Added.
* css3/compositing/blend-mode-overflow.html: Added.
* css3/compositing/blend-mode-reflection.html: Added.
* css3/compositing/blend-mode-should-not-have-compositing-layer-expected.txt: Added.
* css3/compositing/blend-mode-should-not-have-compositing-layer.html: Added.
* css3/compositing/blend-mode-simple.html: Added.
* css3/compositing/should-have-compositing-layer-expected.txt:
* platform/efl/TestExpectations: Efl doesn't support blend modes at the moment.
* platform/mac/css3/compositing/blend-mode-layers-expected.png: Added.
* platform/mac/css3/compositing/blend-mode-layers-expected.txt: Added.
* platform/mac/css3/compositing/blend-mode-overflow-expected.png: Added.
* platform/mac/css3/compositing/blend-mode-reflection-expected.png: Added.
* platform/mac/css3/compositing/blend-mode-reflection-expected.txt: Added.
* platform/mac/css3/compositing/blend-mode-simple-expected.png: Added.
* platform/mac/css3/compositing/blend-mode-simple-expected.txt: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3compositingshouldhavecompositinglayerexpectedtxt">trunk/LayoutTests/css3/compositing/should-have-compositing-layer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerh">trunk/Source/WebCore/platform/graphics/GraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCAFiltersh">trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCALayerh">trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacPlatformCAFiltersMacmm">trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMacmm">trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm</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>
<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="#trunkLayoutTestscss3compositingblendmodelayershtml">trunk/LayoutTests/css3/compositing/blend-mode-layers.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingblendmodeoverflowexpectedtxt">trunk/LayoutTests/css3/compositing/blend-mode-overflow-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3compositingblendmodeoverflowhtml">trunk/LayoutTests/css3/compositing/blend-mode-overflow.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingblendmodereflectionhtml">trunk/LayoutTests/css3/compositing/blend-mode-reflection.html</a></li>
<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="#trunkLayoutTestscss3compositingblendmodesimplehtml">trunk/LayoutTests/css3/compositing/blend-mode-simple.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="#trunkLayoutTestsplatformmaccss3compositingblendmodesimpleexpectedtxt">trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacPlatformCAFiltersMach">trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (161627 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-10 11:17:44 UTC (rev 161627)
+++ trunk/LayoutTests/ChangeLog 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-01-10 Mihai Tica <mitica@adobe.com>
+
+ Add support for blendmode to Core Animation layer.
+ Patch by Rik Cabanier, Dean Jackson and Mihai Tica.
+
+ https://bugs.webkit.org/show_bug.cgi?id=99200
+
+ Reviewed by Dirk Schulze.
+
+ * css3/compositing/blend-mode-layers.html: Added.
+ * css3/compositing/blend-mode-overflow-expected.txt: Added.
+ * css3/compositing/blend-mode-overflow.html: Added.
+ * css3/compositing/blend-mode-reflection.html: Added.
+ * css3/compositing/blend-mode-should-not-have-compositing-layer-expected.txt: Added.
+ * css3/compositing/blend-mode-should-not-have-compositing-layer.html: Added.
+ * css3/compositing/blend-mode-simple.html: Added.
+ * css3/compositing/should-have-compositing-layer-expected.txt:
+ * platform/efl/TestExpectations: Efl doesn't support blend modes at the moment.
+ * platform/mac/css3/compositing/blend-mode-layers-expected.png: Added.
+ * platform/mac/css3/compositing/blend-mode-layers-expected.txt: Added.
+ * platform/mac/css3/compositing/blend-mode-overflow-expected.png: Added.
+ * platform/mac/css3/compositing/blend-mode-reflection-expected.png: Added.
+ * platform/mac/css3/compositing/blend-mode-reflection-expected.txt: Added.
+ * platform/mac/css3/compositing/blend-mode-simple-expected.png: Added.
+ * platform/mac/css3/compositing/blend-mode-simple-expected.txt: Added.
+
</ins><span class="cx"> 2014-01-10 Andrei Bucur <abucur@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Regions] Implement visual overflow computation for inline elements
</span></span></pre></div>
<a id="trunkLayoutTestscss3compositingblendmodelayershtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/blend-mode-layers.html (0 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-layers.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/blend-mode-layers.html 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -0,0 +1,67 @@
</span><ins>+<!DOCTYPE HTML>
+<head>
+ <script>
+ if (window.testRunner)
+ window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "1");
+ </script>
+
+ <style>
+ img {
+ width: 150px;
+ height: 150px;
+ }
+
+ .div1 {
+ width: 160px;
+ height: 75px;
+ margin: 50px 0px 0px;
+ background-color: cyan;
+ }
+
+ .div2 {
+ width: 160px;
+ height: 160px;
+ background-image: url("resources/ducky.png");
+ background-size: 130px 130px;
+ background-repeat: no-repeat;
+ position: relative;
+ top: -40px;
+ left: 20px;
+ }
+
+ .div3 {
+ width: 80px;
+ height: 150px;
+ background-color: yellow;
+ position: relative;
+ top: 10px;
+ left: -20px;
+ }
+
+ li {
+ margin: 5px 5px 120px;
+ width: 160px;
+ height: 50px;
+ background-color: magenta;
+ display: block;
+ float: left;
+ }
+ </style>
+</head>
+
+<!-- This file tests interaction of blending with stacking contexts.
+It uses nested content and then set various attributes to show the interaction of stacking contexts. -->
+<body>
+ <ul>
+ <li><div class="div1"><div class="div2"><div class="div3"></div></div></div></li>
+
+ <!-- setting the blendmode will create a new stacking context which causes z-index to change -->
+ <li><div class="div1"><div class="div2" style="-webkit-blend-mode: multiply"><div class="div3"></div></div></div></li>
+
+ <!-- just setting slight opacity which causes a stacking context. This also causes z-index to be resolved to the stacking context -->
+ <li><div class="div1" style="opacity:.99"><div class="div2"><div class="div3"></div></div></div></li>
+
+ <!-- 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 -->
+ <li><div class="div1" style="opacity:.99"><div class="div2" style="-webkit-blend-mode: multiply"><div class="div3"></div></div></div></li>
+ </ul>
+</body>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/css3/compositing/blend-mode-layers.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkLayoutTestscss3compositingblendmodeoverflowexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/blend-mode-overflow-expected.txt (0 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-overflow-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/compositing/blend-mode-overflow-expected.txt 2014-01-10 11:30:12 UTC (rev 161628)
</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="trunkLayoutTestscss3compositingblendmodeoverflowhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/blend-mode-overflow.html (0 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-overflow.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/blend-mode-overflow.html 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -0,0 +1,105 @@
</span><ins>+<!DOCTYPE HTML>
+<head>
+ <script>
+ if (window.testRunner) {
+ window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "1");
+ window.testRunner.dumpAsText(true);
+ }
+ </script>
+
+ <style>
+ .example {
+ width: 200px;
+ height: 200px;
+ display: inline-block;
+ }
+
+ .blendingbg {
+ position: relative;
+ width: 150px;
+ height: 150px;
+ background: linear-gradient(to right, #0ff 0%, #00f 25%, #f00 50%, #ff0 75%, #0f0 100%);
+ }
+
+ .intermediate {
+ position: absolute;
+ top: 10px;
+ left: 10px;
+ width: 150px;
+ height: 150px;
+ background: linear-gradient(to bottom, #f00 0%, #0f0 100%);
+ }
+
+ img {
+ position: absolute;
+ top: 20px;
+ left: 20px;
+ width: 150px;
+ height: 150px;
+ }
+
+ ol {
+ margin-bottom: 2em;
+ }
+ </style>
+</head>
+<body>
+ <ul>
+ <ol>
+ <li>No blending. Duck should be yellow everywhere.</li>
+ <li>Simple blending. Duck should be a horizontal rainbow inside, and blue on overflow.</li>
+ <li>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).</li>
+ <li>Intermediate parent - no stacking context. Duck should be a vertical gradient inside, and blue on overflow.</li>
+ <li>Intermediate parent with grandparent stacking context. Duck should be a vertical gradient inside, and yellow on overflow.</li>
+ <li>Intermediate parent has overflow. Duck should be a vertical gradient inside, and overflow is hidden.</li>
+ </ol>
+
+ <!-- no blending -->
+ <div class="example">
+ <div class="blendingbg">
+ <img src="resources/ducky.png">
+ </div>
+ </div>
+
+ <!-- normal blending -->
+ <div class="example">
+ <div class="blendingbg">
+ <img src="resources/ducky.png" style="-webkit-blend-mode: difference;">
+ </div>
+ </div>
+
+ <!-- parent is a stacking context -->
+ <div class="example">
+ <div class="blendingbg" style="-webkit-transform: translateZ(0)">
+ <img src="resources/ducky.png" style="-webkit-blend-mode: difference;">
+ </div>
+ </div>
+
+ <!-- intermediate hierarchy -->
+ <div class="example">
+ <div class="blendingbg">
+ <div class="intermediate">
+ <img src="resources/ducky.png" style="-webkit-blend-mode: difference;">
+ </div>
+ </div>
+ </div>
+
+ <!-- intermediate hierarchy with stacking context -->
+ <div class="example">
+ <div class="blendingbg" style="-webkit-transform: translateZ(0)">
+ <div class="intermediate">
+ <img src="resources/ducky.png" style="-webkit-blend-mode: difference;">
+ </div>
+ </div>
+ </div>
+
+ <!-- intermediate hierarchy that overflows -->
+ <div class="example">
+ <div class="blendingbg" style="-webkit-transform: translateZ(0)">
+ <div class="intermediate" style="overflow: hidden">
+ <img src="resources/ducky.png" style="-webkit-blend-mode: difference;">
+ </div>
+ </div>
+ </div>
+ </ul>
+</body>
</ins><span class="cx">Property changes on: trunk/LayoutTests/css3/compositing/blend-mode-overflow.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkLayoutTestscss3compositingblendmodereflectionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/blend-mode-reflection.html (0 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-reflection.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/blend-mode-reflection.html 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<!DOCTYPE HTML>
+<head>
+ <script>
+ if (window.testRunner)
+ window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "1");
+ </script>
+
+ <style>
+ img {
+ width: 130px;
+ height: 130px;
+ -webkit-box-reflect:below 5px -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(0.5, transparent), to(white));
+ }
+
+ li {
+ margin: 5px;
+ width: 130px;
+ height: 260px;
+ background: -webkit-gradient(linear, left top, right top, color-stop(0%,#00ffff), color-stop(24%,#0000ff), color-stop(50%,#ff0000), color-stop(75%,#ffff00), color-stop(100%,#00ff00));
+ display: block;
+ float: left;
+ }
+ </style>
+ </head>
+
+<!-- This file should contain a duck on top of a gradient that has a reflection.
+Both the duck and the reflection should blend. -->
+<body>
+ <ul><li><img style="-webkit-blend-mode: multiply" src="resources/ducky.png"></li></ul>
+</body>
</ins><span class="cx">Property changes on: trunk/LayoutTests/css3/compositing/blend-mode-reflection.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkLayoutTestscss3compositingblendmodeshouldnothavecompositinglayerexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer-expected.txt (0 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer-expected.txt 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -0,0 +1,30 @@
</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 784.00 90.00)
+ (opacity 0.50)
+ (drawsContent 1)
+ (children 1
+ (GraphicsLayer
+ (bounds 160.00 90.00)
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingblendmodeshouldnothavecompositinglayerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer.html (0 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer.html 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!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>
</ins><span class="cx">Property changes on: trunk/LayoutTests/css3/compositing/blend-mode-should-not-have-compositing-layer.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkLayoutTestscss3compositingblendmodesimplehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/blend-mode-simple.html (0 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-simple.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/blend-mode-simple.html 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE HTML>
+<head>
+ <script>
+ if (window.testRunner)
+ window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "1");
+ </script>
+
+ <style>
+ img {
+ width: 130px;
+ height: 130px;
+ }
+
+ 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 class="cx">Property changes on: trunk/LayoutTests/css3/compositing/blend-mode-simple.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkLayoutTestscss3compositingshouldhavecompositinglayerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/compositing/should-have-compositing-layer-expected.txt (161627 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/should-have-compositing-layer-expected.txt 2014-01-10 11:17:44 UTC (rev 161627)
+++ trunk/LayoutTests/css3/compositing/should-have-compositing-layer-expected.txt 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -13,8 +13,14 @@
</span><span class="cx"> (contentsOpaque 1)
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (position 8.00 76.00)
- (bounds 160.00 90.00)
</del><ins>+ (bounds 800.00 600.00)
+ (drawsContent 1)
+ (children 1
+ (GraphicsLayer
+ (position 8.00 76.00)
+ (bounds 160.00 90.00)
+ )
+ )
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/TestExpectations (161627 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/TestExpectations 2014-01-10 11:17:44 UTC (rev 161627)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -492,6 +492,11 @@
</span><span class="cx"> # The following test fail because blending is not yet implemented
</span><span class="cx"> webkit.org/b/105542 fast/canvas/canvas-blend-image.html [ Skip ]
</span><span class="cx"> webkit.org/b/105542 fast/canvas/canvas-blend-solid.html [ Skip ]
</span><ins>+webkit.org/b/99200 css3/compositing/blend-mode-layers.html [ Skip ]
+webkit.org/b/99200 css3/compositing/blend-mode-overflow.html [ Skip ]
+webkit.org/b/99200 css3/compositing/blend-mode-reflection.html [ Skip ]
+webkit.org/b/99200 css3/compositing/blend-mode-simple.html [ Skip ]
+webkit.org/b/99200 css3/compositing/blend-mode-should-not-have-compositing-layer.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # No concept of secure text input
</span><span class="cx"> editing/secure-input [ Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodelayersexpectedpng"></a>
<div class="binary"><h4>Added: 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>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-layers-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodelayersexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-layers-expected.txt (0 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-layers-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-layers-expected.txt 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x191
+ RenderBlock {HTML} at (0,0) size 800x191
+ RenderBody {BODY} at (8,16) size 784x0
+ RenderBlock {UL} at (0,0) size 784x0
+ RenderBlock (floating) {LI} at (45,5) size 160x50 [bgcolor=#FF00FF]
+ RenderBlock {DIV} at (0,50) size 160x75 [bgcolor=#00FFFF]
+ RenderBlock (floating) {LI} at (215,5) size 160x50 [bgcolor=#FF00FF]
+ RenderBlock {DIV} at (0,50) size 160x75 [bgcolor=#00FFFF]
+ RenderBlock (floating) {LI} at (385,5) size 160x50 [bgcolor=#FF00FF]
+ RenderBlock (floating) {LI} at (555,5) size 160x50 [bgcolor=#FF00FF]
+layer at (73,31) size 160x160
+ RenderBlock (relative positioned) {DIV} at (0,0) size 160x160
+layer at (53,41) size 80x150
+ RenderBlock (relative positioned) {DIV} at (0,0) size 80x150 [bgcolor=#FFFF00]
+layer at (243,31) size 160x160
+ RenderBlock (relative positioned) {DIV} at (0,0) size 160x160
+layer at (223,41) size 80x150
+ RenderBlock (relative positioned) {DIV} at (0,0) size 80x150 [bgcolor=#FFFF00]
+layer at (393,71) size 160x75
+ RenderBlock {DIV} at (0,50) size 160x75 [bgcolor=#00FFFF]
+layer at (413,31) size 160x160
+ RenderBlock (relative positioned) {DIV} at (0,0) size 160x160
+layer at (393,41) size 80x150
+ RenderBlock (relative positioned) {DIV} at (0,0) size 80x150 [bgcolor=#FFFF00]
+layer at (563,71) size 160x75
+ RenderBlock {DIV} at (0,50) size 160x75 [bgcolor=#00FFFF]
+layer at (583,31) size 160x160
+ RenderBlock (relative positioned) {DIV} at (0,0) size 160x160
+layer at (563,41) 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>Added: 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>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-overflow-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodereflectionexpectedpng"></a>
<div class="binary"><h4>Added: 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>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-reflection-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodereflectionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-reflection-expected.txt (0 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-reflection-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-reflection-expected.txt 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x286
+ RenderBlock {HTML} at (0,0) size 800x286
+ RenderBody {BODY} at (8,16) size 784x0
+ RenderBlock {UL} at (0,0) size 784x0
+ RenderBlock (floating) {LI} at (45,5) size 130x260
+layer at (53,21) size 130x130
+ RenderImage {IMG} at (0,0) size 130x130
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodesimpleexpectedpng"></a>
<div class="binary"><h4>Added: 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>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmaccss3compositingblendmodesimpleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-expected.txt (0 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-expected.txt 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -0,0 +1,53 @@
</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
+ RenderImage {IMG} at (0,0) 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 (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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161627 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-10 11:17:44 UTC (rev 161627)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2014-01-10 Mihai Tica <mitica@adobe.com>
+
+ Add support for blendmode to Core Animation layer.
+ Patch by Rik Cabanier, Dean Jackson and Mihai Tica.
+
+ https://bugs.webkit.org/show_bug.cgi?id=99200
+
+ Reviewed by Dirk Schulze.
+
+ Tests: css3/compositing/blend-mode-layers.html
+ css3/compositing/blend-mode-overflow.html
+ css3/compositing/blend-mode-reflection.html
+ css3/compositing/blend-mode-should-not-have-compositing-layer.html
+ css3/compositing/blend-mode-simple.html
+
+ * WebCore.exp.in: export PlatformCALayer::setBlendMode for WebKit::PlatformCALayerRemote
+ * WebCore.xcodeproj/project.pbxproj: Add PlatformCAFiltersMac.h
+ * platform/graphics/GraphicsLayer.cpp: add blendMode member
+ (WebCore::GraphicsLayer::GraphicsLayer):
+ * platform/graphics/GraphicsLayer.h:
+ (WebCore::GraphicsLayer::blendMode):
+ (WebCore::GraphicsLayer::setBlendMode):
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::setBlendMode):
+ (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): add call to updateBlendMode()
+ (WebCore::GraphicsLayerCA::updateBlendMode):
+ * platform/graphics/ca/GraphicsLayerCA.h:
+ * platform/graphics/ca/PlatformCAFilters.h:
+ * platform/graphics/ca/PlatformCALayer.h:
+ * platform/graphics/ca/mac/PlatformCAFiltersMac.h: Added.
+ * platform/graphics/ca/mac/PlatformCAFiltersMac.mm:
+ (PlatformCAFilters::setBlendingFiltersOnLayer): set a compositing CAFilter on CALayer
+ * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+ (PlatformCALayer::setBlendMode): call to PlatformCAFilters::setBlendingFiltersOnLayer
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
+ (WebCore::RenderLayerBacking::updateBlendMode):
+ (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
+ (WebCore::RenderLayerBacking::setBlendMode):
+ * rendering/RenderLayerBacking.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::CompositingState::CompositingState): add m_subtreeHasBlending member
+ (WebCore::RenderLayerCompositor::computeCompositingRequirements): promote layer if subtree has blending
+ (WebCore::RenderLayerCompositor::reasonsForCompositing):
+ (WebCore::RenderLayerCompositor::logReasonsForCompositing): log blending reason
+ (WebCore::RenderLayerCompositor::requiresCompositingForIndirectReason): add blending reason
+ * rendering/RenderLayerCompositor.h:
+
</ins><span class="cx"> 2014-01-10 Andrei Bucur <abucur@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Regions] Implement visual overflow computation for inline elements
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (161627 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-01-10 11:17:44 UTC (rev 161627)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -516,6 +516,7 @@
</span><span class="cx"> __ZN7WebCore15GraphicsContextD1Ev
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA10initializeEv
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA10setFiltersERKNS_16FilterOperationsE
</span><ins>+__ZN7WebCore15GraphicsLayerCA12setBlendModeENS_9BlendModeE
</ins><span class="cx"> __ZN7WebCore15GraphicsLayerCA10setOpacityEf
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA11setChildrenERKN3WTF6VectorIPNS_13GraphicsLayerELm0ENS1_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA11setPositionERKNS_10FloatPointE
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (161627 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-10 11:17:44 UTC (rev 161627)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -5625,6 +5625,7 @@
</span><span class="cx"> D6489D26166FFCF1007C031B /* JSHTMLTemplateElement.h in Headers */ = {isa = PBXBuildFile; fileRef = D6489D24166FFCF1007C031B /* JSHTMLTemplateElement.h */; };
</span><span class="cx"> D66817FA166FE6D700FA07B4 /* HTMLTemplateElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6EFC0BB1666DF7A003D291E /* HTMLTemplateElement.cpp */; };
</span><span class="cx"> D66817FB166FE6D700FA07B4 /* HTMLTemplateElement.h in Headers */ = {isa = PBXBuildFile; fileRef = D6EFC0BC1666DF7A003D291E /* HTMLTemplateElement.h */; };
</span><ins>+ D66B2D5C186830050073C4DD /* PlatformCAFiltersMac.h in Headers */ = {isa = PBXBuildFile; fileRef = D66B2D5B186830050073C4DD /* PlatformCAFiltersMac.h */; };
</ins><span class="cx"> D6E276AF14637455001D280A /* MutationObserverRegistration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6E276AD14637455001D280A /* MutationObserverRegistration.cpp */; };
</span><span class="cx"> D6E276B014637455001D280A /* MutationObserverRegistration.h in Headers */ = {isa = PBXBuildFile; fileRef = D6E276AE14637455001D280A /* MutationObserverRegistration.h */; };
</span><span class="cx"> D6E528A3149A926D00EFE1F3 /* MutationObserverInterestGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6E528A1149A926D00EFE1F3 /* MutationObserverInterestGroup.cpp */; };
</span><span class="lines">@@ -12893,6 +12894,7 @@
</span><span class="cx"> D630E2AB149BF344005B2F93 /* HistogramSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistogramSupport.h; sourceTree = "<group>"; };
</span><span class="cx"> D6489D23166FFCF1007C031B /* JSHTMLTemplateElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLTemplateElement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> D6489D24166FFCF1007C031B /* JSHTMLTemplateElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLTemplateElement.h; sourceTree = "<group>"; };
</span><ins>+ D66B2D5B186830050073C4DD /* PlatformCAFiltersMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlatformCAFiltersMac.h; path = ca/mac/PlatformCAFiltersMac.h; sourceTree = "<group>"; };
</ins><span class="cx"> D6E276AD14637455001D280A /* MutationObserverRegistration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MutationObserverRegistration.cpp; sourceTree = "<group>"; };
</span><span class="cx"> D6E276AE14637455001D280A /* MutationObserverRegistration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MutationObserverRegistration.h; sourceTree = "<group>"; };
</span><span class="cx"> D6E528A1149A926D00EFE1F3 /* MutationObserverInterestGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MutationObserverInterestGroup.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -15442,6 +15444,7 @@
</span><span class="cx"> 1AA71608149BC4DA0016EC19 /* TileController.mm */,
</span><span class="cx"> 0F580FA11496939100FB5BD8 /* WebTiledBackingLayer.h */,
</span><span class="cx"> 0F580FA21496939100FB5BD8 /* WebTiledBackingLayer.mm */,
</span><ins>+ D66B2D5B186830050073C4DD /* PlatformCAFiltersMac.h */,
</ins><span class="cx"> );
</span><span class="cx"> name = mac;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -24522,6 +24525,7 @@
</span><span class="cx"> BC60DB4A0D2A3D1E00B9918F /* JSXPathException.h in Headers */,
</span><span class="cx"> 1A762C760A074F2600989F5B /* JSXPathExpression.h in Headers */,
</span><span class="cx"> 1A762C780A074F2600989F5B /* JSXPathNSResolver.h in Headers */,
</span><ins>+ D66B2D5C186830050073C4DD /* PlatformCAFiltersMac.h in Headers */,
</ins><span class="cx"> 1A762C7A0A074F2600989F5B /* JSXPathResult.h in Headers */,
</span><span class="cx"> BCEFE1EB0DCA5F6400739219 /* JSXSLTProcessor.h in Headers */,
</span><span class="cx"> 85031B440A44EFC700F992E0 /* KeyboardEvent.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (161627 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2014-01-10 11:17:44 UTC (rev 161627)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -78,6 +78,9 @@
</span><span class="cx"> , m_anchorPoint(0.5f, 0.5f, 0)
</span><span class="cx"> , m_opacity(1)
</span><span class="cx"> , m_zPosition(0)
</span><ins>+#if ENABLE(CSS_COMPOSITING)
+ , m_blendMode(BlendModeNormal)
+#endif
</ins><span class="cx"> , m_contentsOpaque(false)
</span><span class="cx"> , m_preserves3D(false)
</span><span class="cx"> , m_backfaceVisibility(true)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (161627 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2014-01-10 11:17:44 UTC (rev 161627)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -44,6 +44,10 @@
</span><span class="cx"> #include "FilterOperations.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_COMPOSITING)
+#include "GraphicsTypes.h"
+#endif
+
</ins><span class="cx"> enum LayerTreeAsTextBehaviorFlags {
</span><span class="cx"> LayerTreeAsTextBehaviorNormal = 0,
</span><span class="cx"> LayerTreeAsTextDebug = 1 << 0, // Dump extra debugging info like layer addresses.
</span><span class="lines">@@ -345,6 +349,11 @@
</span><span class="cx"> virtual bool setFilters(const FilterOperations& filters) { m_filters = filters; return true; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_COMPOSITING)
+ BlendMode blendMode() const { return m_blendMode; }
+ virtual void setBlendMode(BlendMode blendMode) { m_blendMode = blendMode; }
+#endif
+
</ins><span class="cx"> // Some GraphicsLayers paint only the foreground or the background content
</span><span class="cx"> GraphicsLayerPaintingPhase paintingPhase() const { return m_paintingPhase; }
</span><span class="cx"> void setPaintingPhase(GraphicsLayerPaintingPhase phase) { m_paintingPhase = phase; }
</span><span class="lines">@@ -567,6 +576,10 @@
</span><span class="cx"> FilterOperations m_filters;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_COMPOSITING)
+ BlendMode m_blendMode;
+#endif
+
</ins><span class="cx"> bool m_contentsOpaque : 1;
</span><span class="cx"> bool m_preserves3D: 1;
</span><span class="cx"> bool m_backfaceVisibility : 1;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (161627 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-01-10 11:17:44 UTC (rev 161627)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -711,6 +711,17 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_COMPOSITING)
+void GraphicsLayerCA::setBlendMode(BlendMode blendMode)
+{
+ if (GraphicsLayer::blendMode() == blendMode)
+ return;
+
+ GraphicsLayer::setBlendMode(blendMode);
+ noteLayerPropertyChanged(BlendModeChanged);
+}
+#endif
+
</ins><span class="cx"> void GraphicsLayerCA::setNeedsDisplay()
</span><span class="cx"> {
</span><span class="cx"> setNeedsDisplayInRect(FloatRect::infiniteRect());
</span><span class="lines">@@ -1353,7 +1364,12 @@
</span><span class="cx"> if (m_uncommittedChanges & FiltersChanged)
</span><span class="cx"> updateFilters();
</span><span class="cx"> #endif
</span><del>-
</del><ins>+
+#if ENABLE(CSS_COMPOSITING)
+ if (m_uncommittedChanges & BlendModeChanged)
+ updateBlendMode();
+#endif
+
</ins><span class="cx"> if (m_uncommittedChanges & AnimationChanged)
</span><span class="cx"> updateAnimations();
</span><span class="cx">
</span><span class="lines">@@ -1689,6 +1705,22 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_COMPOSITING)
+void GraphicsLayerCA::updateBlendMode()
+{
+ primaryLayer()->setBlendMode(m_blendMode);
+
+ if (LayerMap* layerCloneMap = primaryLayerClones()) {
+ LayerMap::const_iterator end = layerCloneMap->end();
+ for (LayerMap::const_iterator it = layerCloneMap->begin(); it != end; ++it) {
+ if (m_replicaLayer && isReplicatedRootClone(it->key))
+ continue;
+ it->value->setBlendMode(m_blendMode);
+ }
+ }
+}
+#endif
+
</ins><span class="cx"> void GraphicsLayerCA::updateStructuralLayer()
</span><span class="cx"> {
</span><span class="cx"> ensureStructuralLayer(structuralLayerPurpose());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (161627 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-01-10 11:17:44 UTC (rev 161627)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -105,6 +105,10 @@
</span><span class="cx"> virtual bool filtersCanBeComposited(const FilterOperations&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_COMPOSITING)
+ virtual void setBlendMode(BlendMode) OVERRIDE;
+#endif
+
</ins><span class="cx"> virtual void setNeedsDisplay();
</span><span class="cx"> virtual void setNeedsDisplayInRect(const FloatRect&, ShouldClipToLayer = ClipToLayer);
</span><span class="cx"> virtual void setContentsNeedsDisplay();
</span><span class="lines">@@ -202,7 +206,11 @@
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><span class="cx"> void updateFilters();
</span><span class="cx"> #endif
</span><del>-
</del><ins>+
+#if ENABLE(CSS_COMPOSITING)
+ void updateBlendMode();
+#endif
+
</ins><span class="cx"> virtual PassRefPtr<PlatformCALayer> createPlatformCALayer(PlatformCALayer::LayerType, PlatformCALayerClient* owner);
</span><span class="cx"> virtual PassRefPtr<PlatformCALayer> createPlatformCALayer(PlatformLayer*, PlatformCALayerClient* owner);
</span><span class="cx">
</span><span class="lines">@@ -440,7 +448,8 @@
</span><span class="cx"> TilingAreaChanged = 1 << 28,
</span><span class="cx"> TilesAdded = 1 < 29,
</span><span class="cx"> DebugIndicatorsChanged = 1 << 30,
</span><del>- CustomAppearanceChanged = 1 << 31
</del><ins>+ CustomAppearanceChanged = 1 << 31,
+ BlendModeChanged = 1 << 32
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned LayerChangeFlags;
</span><span class="cx"> enum ScheduleFlushOrNot { ScheduleFlush, DontScheduleFlush };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCAFiltersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h (161627 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h 2014-01-10 11:17:44 UTC (rev 161627)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><span class="cx">
</span><span class="cx"> #include "FilterOperations.h"
</span><ins>+#include "GraphicsTypes.h"
</ins><span class="cx"> #include "PlatformLayer.h"
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -43,9 +44,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class PlatformCALayer;
+
</ins><span class="cx"> class PlatformCAFilters {
</span><span class="cx"> public:
</span><span class="cx"> static void setFiltersOnLayer(PlatformLayer*, const FilterOperations&);
</span><ins>+ static void setBlendingFiltersOnLayer(PlatformCALayer*, const BlendMode);
</ins><span class="cx"> static int numAnimatedFilterProperties(FilterOperation::OperationType);
</span><span class="cx"> static const char* animatedFilterPropertyName(FilterOperation::OperationType, int internalFilterPropertyIndex);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCALayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h (161627 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2014-01-10 11:17:44 UTC (rev 161627)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -181,6 +181,10 @@
</span><span class="cx"> virtual void copyFiltersFrom(const PlatformCALayer*) = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_COMPOSITING)
+ void setBlendMode(BlendMode);
+#endif
+
</ins><span class="cx"> virtual void setName(const String&) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void setSpeed(float) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCAFiltersMach"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.h (0 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.h 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef PlatformCAFiltersMac_h
+#define PlatformCAFiltersMac_h
+
+#if USE_CA_FILTERS
+struct CAColorMatrix {
+ float m11, m12, m13, m14, m15;
+ float m21, m22, m23, m24, m25;
+ float m31, m32, m33, m34, m35;
+ float m41, m42, m43, m44, m45;
+};
+
+typedef struct CAColorMatrix CAColorMatrix;
+
+@interface NSValue(Details)
++ (NSValue *)valueWithCAColorMatrix:(CAColorMatrix)t;
+@end
+
+@interface CAFilter : NSObject <NSCopying, NSMutableCopying, NSCoding>
+@end
+
+@interface CAFilter(Details)
+@property(copy) NSString *name;
++ (CAFilter *)filterWithType:(NSString *)type;
+@end
+
+extern NSString * const kCAFilterColorMatrix;
+extern NSString * const kCAFilterColorMonochrome;
+extern NSString * const kCAFilterColorHueRotate;
+extern NSString * const kCAFilterColorSaturate;
+extern NSString * const kCAFilterGaussianBlur;
+
+#if ENABLE(CSS_COMPOSITING)
+extern NSString * const kCAFilterNormalBlendMode;
+extern NSString * const kCAFilterMultiplyBlendMode;
+extern NSString * const kCAFilterScreenBlendMode;
+extern NSString * const kCAFilterOverlayBlendMode;
+extern NSString * const kCAFilterDarkenBlendMode;
+extern NSString * const kCAFilterLightenBlendMode;
+extern NSString * const kCAFilterColorDodgeBlendMode;
+extern NSString * const kCAFilterColorBurnBlendMode;
+extern NSString * const kCAFilterSoftLightBlendMode;
+extern NSString * const kCAFilterHardLightBlendMode;
+extern NSString * const kCAFilterDifferenceBlendMode;
+extern NSString * const kCAFilterExclusionBlendMode;
+#endif // CSS_COMPOSITING
+
+#endif // CA_FILTERS
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCAFiltersMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm (161627 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm 2014-01-10 11:17:44 UTC (rev 161627)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -33,41 +33,12 @@
</span><span class="cx"> #import "BlockExceptions.h"
</span><span class="cx"> #import "FloatConversion.h"
</span><span class="cx"> #import "LengthFunctions.h" // This is a layering violation.
</span><ins>+#import "PlatformCAFiltersMac.h"
</ins><span class="cx"> #import "PlatformCALayerMac.h"
</span><span class="cx"> #import <QuartzCore/QuartzCore.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-#if USE_CA_FILTERS
-struct CAColorMatrix
-{
- float m11, m12, m13, m14, m15;
- float m21, m22, m23, m24, m25;
- float m31, m32, m33, m34, m35;
- float m41, m42, m43, m44, m45;
-};
-
-typedef struct CAColorMatrix CAColorMatrix;
-
-@interface NSValue (Details)
-+ (NSValue *)valueWithCAColorMatrix:(CAColorMatrix)t;
-@end
-
-@interface CAFilter : NSObject <NSCopying, NSMutableCopying, NSCoding>
-@end
-
-@interface CAFilter (Details)
-@property(copy) NSString *name;
-+ (CAFilter *)filterWithType:(NSString *)type;
-@end
-
-extern NSString * const kCAFilterColorMatrix;
-extern NSString * const kCAFilterColorMonochrome;
-extern NSString * const kCAFilterColorHueRotate;
-extern NSString * const kCAFilterColorSaturate;
-extern NSString * const kCAFilterGaussianBlur;
-#endif
-
</del><span class="cx"> // FIXME: Should share these values with FilterEffectRenderer::build() (https://bugs.webkit.org/show_bug.cgi?id=76008).
</span><span class="cx"> static double sepiaFullConstants[3][3] = {
</span><span class="cx"> { 0.393, 0.769, 0.189 },
</span><span class="lines">@@ -599,6 +570,70 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+void PlatformCAFilters::setBlendingFiltersOnLayer(PlatformCALayer* platformCALayer, const BlendMode blendMode)
+{
+#if USE_CA_FILTERS
+ CALayer* layer = platformCALayer->platformLayer();
+
+ BEGIN_BLOCK_OBJC_EXCEPTIONS
+
+ CAFilter* filter = nil;
+
+ switch (blendMode) {
+ case BlendModeNormal:
+ // No need to set an actual filter object in this case.
+ break;
+ case BlendModeOverlay:
+ filter = [CAFilter filterWithType:kCAFilterOverlayBlendMode];
+ break;
+ case BlendModeColorDodge:
+ filter = [CAFilter filterWithType:kCAFilterColorDodgeBlendMode];
+ break;
+ case BlendModeColorBurn:
+ filter = [CAFilter filterWithType:kCAFilterColorBurnBlendMode];
+ break;
+ case BlendModeDarken:
+ filter = [CAFilter filterWithType:kCAFilterDarkenBlendMode];
+ break;
+ case BlendModeDifference:
+ filter = [CAFilter filterWithType:kCAFilterDifferenceBlendMode];
+ break;
+ case BlendModeExclusion:
+ filter = [CAFilter filterWithType:kCAFilterExclusionBlendMode];
+ break;
+ case BlendModeHardLight:
+ filter = [CAFilter filterWithType:kCAFilterHardLightBlendMode];
+ break;
+ case BlendModeMultiply:
+ filter = [CAFilter filterWithType:kCAFilterMultiplyBlendMode];
+ break;
+ case BlendModeLighten:
+ filter = [CAFilter filterWithType:kCAFilterLightenBlendMode];
+ break;
+ case BlendModeSoftLight:
+ filter = [CAFilter filterWithType:kCAFilterSoftLightBlendMode];
+ break;
+ case BlendModeScreen:
+ filter = [CAFilter filterWithType:kCAFilterScreenBlendMode];
+ break;
+ case BlendModeHue:
+ case BlendModeSaturation:
+ case BlendModeColor:
+ case BlendModeLuminosity:
+ // Non-separable blend modes are not supported.
+ break;
+ }
+
+ [layer setCompositingFilter:filter];
+
+ END_BLOCK_OBJC_EXCEPTIONS
+
+#else
+ UNUSED_PARAM(platformCALayer);
+ UNUSED_PARAM(blendMode);
+#endif
+}
+
</ins><span class="cx"> int PlatformCAFilters::numAnimatedFilterProperties(FilterOperation::OperationType type)
</span><span class="cx"> {
</span><span class="cx"> #if USE_CA_FILTERS
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (161627 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2014-01-10 11:17:44 UTC (rev 161627)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #import "GraphicsLayerCA.h"
</span><span class="cx"> #import "LengthFunctions.h"
</span><span class="cx"> #import "PlatformCAFilters.h"
</span><ins>+#import "PlatformCAFiltersMac.h"
</ins><span class="cx"> #import "ScrollbarThemeMac.h"
</span><span class="cx"> #import "SoftLinking.h"
</span><span class="cx"> #import "TiledBacking.h"
</span><span class="lines">@@ -706,6 +707,13 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_COMPOSITING)
+void PlatformCALayer::setBlendMode(BlendMode blendMode)
+{
+ PlatformCAFilters::setBlendingFiltersOnLayer(this, blendMode);
+}
+#endif
+
</ins><span class="cx"> void PlatformCALayerMac::setName(const String& value)
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (161627 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-01-10 11:17:44 UTC (rev 161627)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx"> updateFilters(&renderer().style());
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- updateLayerBlendMode(&renderer().style());
</del><ins>+ updateBlendMode(&renderer().style());
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -404,8 +404,12 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>-void RenderLayerBacking::updateLayerBlendMode(const RenderStyle*)
</del><ins>+void RenderLayerBacking::updateBlendMode(const RenderStyle* style)
</ins><span class="cx"> {
</span><ins>+ if (m_ancestorClippingLayer)
+ m_ancestorClippingLayer->setBlendMode(style->blendMode());
+ else
+ m_graphicsLayer->setBlendMode(style->blendMode());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -677,7 +681,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- updateLayerBlendMode(&renderer().style());
</del><ins>+ updateBlendMode(&renderer().style());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool isSimpleContainer = isSimpleContainerCompositingLayer();
</span><span class="lines">@@ -2070,8 +2074,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>-void RenderLayerBacking::setBlendMode(BlendMode)
</del><ins>+void RenderLayerBacking::setBlendMode(BlendMode blendMode)
</ins><span class="cx"> {
</span><ins>+ m_graphicsLayer->setBlendMode(blendMode);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (161627 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-01-10 11:17:44 UTC (rev 161627)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> void updateFilters(const RenderStyle*);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- void updateLayerBlendMode(const RenderStyle*);
</del><ins>+ void updateBlendMode(const RenderStyle*);
</ins><span class="cx"> #endif
</span><span class="cx"> // Return the opacity value that this layer should use for compositing.
</span><span class="cx"> float compositingOpacity(float rendererOpacity) const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (161627 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-01-10 11:17:44 UTC (rev 161627)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -193,6 +193,7 @@
</span><span class="cx"> : m_compositingAncestor(compAncestor)
</span><span class="cx"> , m_subtreeIsCompositing(false)
</span><span class="cx"> , m_testingOverlap(testOverlap)
</span><ins>+ , m_subtreeHasBlending(false)
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> , m_depth(0)
</span><span class="cx"> #endif
</span><span class="lines">@@ -203,6 +204,7 @@
</span><span class="cx"> : m_compositingAncestor(other.m_compositingAncestor)
</span><span class="cx"> , m_subtreeIsCompositing(other.m_subtreeIsCompositing)
</span><span class="cx"> , m_testingOverlap(other.m_testingOverlap)
</span><ins>+ , m_subtreeHasBlending(other.m_subtreeHasBlending)
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> , m_depth(other.m_depth + 1)
</span><span class="cx"> #endif
</span><span class="lines">@@ -212,6 +214,7 @@
</span><span class="cx"> RenderLayer* m_compositingAncestor;
</span><span class="cx"> bool m_subtreeIsCompositing;
</span><span class="cx"> bool m_testingOverlap;
</span><ins>+ bool m_subtreeHasBlending;
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> int m_depth;
</span><span class="cx"> #endif
</span><span class="lines">@@ -1152,6 +1155,10 @@
</span><span class="cx"> willBeComposited = true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // If the layer composited for other reasons than blending, it is no longer needed to keep track of whether a child was blended.
+ if (compositingState.m_subtreeHasBlending && !layer.hasBlendMode())
+ compositingState.m_subtreeHasBlending = false;
+
</ins><span class="cx"> ASSERT(willBeComposited == needsToBeComposited(layer));
</span><span class="cx">
</span><span class="cx"> // All layers (even ones that aren't being composited) need to get added to
</span><span class="lines">@@ -1160,10 +1167,13 @@
</span><span class="cx"> if (overlapMap && childState.m_compositingAncestor && !childState.m_compositingAncestor->isRootLayer())
</span><span class="cx"> addToOverlapMap(*overlapMap, layer, absBounds, haveComputedBounds);
</span><span class="cx">
</span><ins>+ if (childState.m_subtreeHasBlending || layer.hasBlendMode())
+ compositingState.m_subtreeHasBlending = true;
+
</ins><span class="cx"> // Now check for reasons to become composited that depend on the state of descendant layers.
</span><span class="cx"> RenderLayer::IndirectCompositingReason indirectCompositingReason;
</span><span class="cx"> if (!willBeComposited && canBeComposited(layer)
</span><del>- && requiresCompositingForIndirectReason(layer.renderer(), childState.m_subtreeIsCompositing, anyDescendantHas3DTransform, indirectCompositingReason)) {
</del><ins>+ && requiresCompositingForIndirectReason(layer.renderer(), childState.m_subtreeIsCompositing, compositingState.m_subtreeHasBlending, anyDescendantHas3DTransform, indirectCompositingReason)) {
</ins><span class="cx"> layer.setIndirectCompositingReason(indirectCompositingReason);
</span><span class="cx"> childState.m_compositingAncestor = &layer;
</span><span class="cx"> if (overlapMap) {
</span><span class="lines">@@ -2040,6 +2050,9 @@
</span><span class="cx"> if (requiresCompositingForFilters(*renderer))
</span><span class="cx"> reasons |= CompositingReasonFilters;
</span><span class="cx">
</span><ins>+ if (requiresCompositingForBlending(*renderer))
+ reasons |= CompositingReasonBlending;
+
</ins><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">@@ -2115,6 +2128,9 @@
</span><span class="cx"> if (reasons & CompositingReasonFilters)
</span><span class="cx"> return "filters";
</span><span class="cx">
</span><ins>+ if (reasons & CompositingReasonBlending)
+ return "blending";
+
</ins><span class="cx"> if (reasons & CompositingReasonPositionFixed)
</span><span class="cx"> return "position: fixed";
</span><span class="cx">
</span><span class="lines">@@ -2339,13 +2355,13 @@
</span><span class="cx"> || animController.isRunningAnimationOnRenderer(&renderer, CSSPropertyWebkitTransform);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderLayerCompositor::requiresCompositingForIndirectReason(RenderLayerModelObject& renderer, bool hasCompositedDescendants, bool has3DTransformedDescendants, RenderLayer::IndirectCompositingReason& reason) const
</del><ins>+bool RenderLayerCompositor::requiresCompositingForIndirectReason(RenderLayerModelObject& renderer, bool hasCompositedDescendants, bool hasBlendedDescendants, bool has3DTransformedDescendants, RenderLayer::IndirectCompositingReason& reason) const
</ins><span class="cx"> {
</span><span class="cx"> RenderLayer& layer = *toRenderBoxModelObject(renderer).layer();
</span><span class="cx">
</span><span class="cx"> // When a layer has composited descendants, some effects, like 2d transforms, filters, masks etc must be implemented
</span><span class="cx"> // via compositing so that they also apply to those composited descendants.
</span><del>- if (hasCompositedDescendants && (layer.transform() || renderer.createsGroup() || renderer.hasReflection() || renderer.isRenderNamedFlowFragmentContainer())) {
</del><ins>+ if (hasCompositedDescendants && (hasBlendedDescendants || layer.transform() || renderer.createsGroup() || renderer.hasReflection() || renderer.isRenderNamedFlowFragmentContainer())) {
</ins><span class="cx"> reason = RenderLayer::IndirectCompositingForGraphicalEffect;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (161627 => 161628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-01-10 11:17:44 UTC (rev 161627)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-01-10 11:30:12 UTC (rev 161628)
</span><span class="lines">@@ -82,7 +82,8 @@
</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
</del><ins>+ CompositingReasonRoot = 1 << 23,
+ CompositingReasonBlending = 1 << 24
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned CompositingReasons;
</span><span class="cx">
</span><span class="lines">@@ -392,7 +393,7 @@
</span><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><del>- bool requiresCompositingForIndirectReason(RenderLayerModelObject&, bool hasCompositedDescendants, bool has3DTransformedDescendants, RenderLayer::IndirectCompositingReason&) const;
</del><ins>+ bool requiresCompositingForIndirectReason(RenderLayerModelObject&, bool hasCompositedDescendants, bool hasBlendedDescendants, bool has3DTransformedDescendants, RenderLayer::IndirectCompositingReason&) const;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> bool requiresCompositingForScrolling(RenderLayerModelObject&) const;
</span></span></pre>
</div>
</div>
</body>
</html>