<!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>[151566] 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/151566">151566</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-06-13 11:25:10 -0700 (Thu, 13 Jun 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[CSS Background Blending] Enable CSS Background blending for layers with SVGs.

Source/WebCore:

The change implies adding the blending parameter for SVGImage
https://bugs.webkit.org/show_bug.cgi?id=117588

Patch by Mihai Tica &lt;mitica@adobe.com&gt; on 2013-06-13
Reviewed by Dirk Schulze.

Tests: css3/compositing/background-blend-mode-image-svg.html
       css3/compositing/background-blend-mode-svg-color.html

* svg/graphics/SVGImage.cpp:
(WebCore::SVGImage::draw):

LayoutTests:

Adding tests for SVGs over simple background colors and images blending with SVGs.
https://bugs.webkit.org/show_bug.cgi?id=117588

Patch by Mihai Tica &lt;mitica@adobe.com&gt; on 2013-06-13
Reviewed by Dirk Schulze.

* css3/compositing/background-blend-mode-image-svg-expected.txt: Added.
* css3/compositing/background-blend-mode-image-svg.html: Added.
* css3/compositing/background-blend-mode-svg-color-expected.txt: Added.
* css3/compositing/background-blend-mode-svg-color.html: Added.
* css3/compositing/resources/red-circle.svg: Added.
* platform/mac/css3/compositing/background-blend-mode-image-svg-expected.png: Added.
* platform/mac/css3/compositing/background-blend-mode-svg-color-expected.png: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsSVGImagecpp">trunk/Source/WebCore/svg/graphics/SVGImage.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3compositingbackgroundblendmodeimagesvgexpectedtxt">trunk/LayoutTests/css3/compositing/background-blend-mode-image-svg-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3compositingbackgroundblendmodeimagesvghtml">trunk/LayoutTests/css3/compositing/background-blend-mode-image-svg.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingbackgroundblendmodesvgcolorexpectedtxt">trunk/LayoutTests/css3/compositing/background-blend-mode-svg-color-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3compositingbackgroundblendmodesvgcolorhtml">trunk/LayoutTests/css3/compositing/background-blend-mode-svg-color.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingresourcesredcirclesvg">trunk/LayoutTests/css3/compositing/resources/red-circle.svg</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingbackgroundblendmodeimagesvgexpectedpng">trunk/LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-svg-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3compositingbackgroundblendmodesvgcolorexpectedpng">trunk/LayoutTests/platform/mac/css3/compositing/background-blend-mode-svg-color-expected.png</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (151565 => 151566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-06-13 18:24:21 UTC (rev 151565)
+++ trunk/LayoutTests/ChangeLog        2013-06-13 18:25:10 UTC (rev 151566)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2013-06-13  Mihai Tica  &lt;mitica@adobe.com&gt;
</span><span class="cx"> 
</span><ins>+        [CSS Background Blending] Enable CSS Background blending for layers with SVGs.
+
+        Adding tests for SVGs over simple background colors and images blending with SVGs.
+        https://bugs.webkit.org/show_bug.cgi?id=117588
+
+        Reviewed by Dirk Schulze.
+
+        * css3/compositing/background-blend-mode-image-svg-expected.txt: Added.
+        * css3/compositing/background-blend-mode-image-svg.html: Added.
+        * css3/compositing/background-blend-mode-svg-color-expected.txt: Added.
+        * css3/compositing/background-blend-mode-svg-color.html: Added.
+        * css3/compositing/resources/red-circle.svg: Added.
+        * platform/mac/css3/compositing/background-blend-mode-image-svg-expected.png: Added.
+        * platform/mac/css3/compositing/background-blend-mode-svg-color-expected.png: Added.
+
+2013-06-13  Mihai Tica  &lt;mitica@adobe.com&gt;
+
</ins><span class="cx">         Updating the -webkit-background-blend-mode property dynamically does not trigger a redraw of the element.
</span><span class="cx"> 
</span><span class="cx">         Adding test that sets background blend modes from script, after the page is loaded.
</span></span></pre></div>
<a id="trunkLayoutTestscss3compositingbackgroundblendmodeimagesvgexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/background-blend-mode-image-svg-expected.txt (0 => 151566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/background-blend-mode-image-svg-expected.txt                                (rev 0)
+++ trunk/LayoutTests/css3/compositing/background-blend-mode-image-svg-expected.txt        2013-06-13 18:25:10 UTC (rev 151566)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingbackgroundblendmodeimagesvghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/background-blend-mode-image-svg.html (0 => 151566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/background-blend-mode-image-svg.html                                (rev 0)
+++ trunk/LayoutTests/css3/compositing/background-blend-mode-image-svg.html        2013-06-13 18:25:10 UTC (rev 151566)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+&lt;!DOCTYPE HTML&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;script&gt;
+    if (window.testRunner)
+        window.testRunner.dumpAsText(true);
+&lt;/script&gt;
+&lt;style&gt;
+    li {
+        margin: 5px;
+        width: 130px;
+        height: 130px;
+        background: url('resources/ducky.png') no-repeat 0 0 /100% 100%, url('resources/red-circle.svg');
+        display: block;
+        float: left;
+    }
+&lt;/style&gt;
+&lt;!-- This file should contain a duck on top of an svg with every type of blending. --&gt;
+&lt;body&gt;
+    &lt;ul&gt;
+        &lt;li style=&quot;-webkit-background-blend-mode: normal, normal&quot;&gt;&lt;/li&gt;
+        &lt;li style=&quot;-webkit-background-blend-mode: multiply, normal&quot;&gt;&lt;/li&gt;
+        &lt;li style=&quot;-webkit-background-blend-mode: screen, normal&quot;&gt;&lt;/li&gt;
+        &lt;li style=&quot;-webkit-background-blend-mode: overlay, normal&quot;&gt;&lt;/li&gt;
+        &lt;li style=&quot;-webkit-background-blend-mode: darken, normal&quot;&gt;&lt;/li&gt;
+        &lt;li style=&quot;-webkit-background-blend-mode: lighten, normal&quot;&gt;&lt;/li&gt;
+        &lt;li style=&quot;-webkit-background-blend-mode: color-dodge, normal&quot;&gt;&lt;/li&gt;
+        &lt;li style=&quot;-webkit-background-blend-mode: color-burn, normal&quot;&gt;&lt;/li&gt;
+        &lt;li style=&quot;-webkit-background-blend-mode: hard-light, normal&quot;&gt;&lt;/li&gt;
+        &lt;li style=&quot;-webkit-background-blend-mode: soft-light, normal&quot;&gt;&lt;/li&gt;
+        &lt;li style=&quot;-webkit-background-blend-mode: difference, normal&quot;&gt;&lt;/li&gt;
+        &lt;li style=&quot;-webkit-background-blend-mode: exclusion, normal&quot;&gt;&lt;/li&gt;
+        &lt;li style=&quot;-webkit-background-blend-mode: hue, normal;&quot;&gt;&lt;/li&gt;
+        &lt;li style=&quot;-webkit-background-blend-mode: saturation, normal&quot;&gt;&lt;/li&gt;
+        &lt;li style=&quot;-webkit-background-blend-mode: color, normal&quot;&gt;&lt;/li&gt;
+        &lt;li style=&quot;-webkit-background-blend-mode: luminosity, normal&quot;&gt;&lt;/li&gt;
+    &lt;/ul&gt;
+&lt;/body&gt;
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingbackgroundblendmodesvgcolorexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/background-blend-mode-svg-color-expected.txt (0 => 151566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/background-blend-mode-svg-color-expected.txt                                (rev 0)
+++ trunk/LayoutTests/css3/compositing/background-blend-mode-svg-color-expected.txt        2013-06-13 18:25:10 UTC (rev 151566)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingbackgroundblendmodesvgcolorhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/background-blend-mode-svg-color.html (0 => 151566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/background-blend-mode-svg-color.html                                (rev 0)
+++ trunk/LayoutTests/css3/compositing/background-blend-mode-svg-color.html        2013-06-13 18:25:10 UTC (rev 151566)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;style&gt;
+    div {
+        width: 130px;
+        height: 130px;
+        background-size: 130px 130px;
+        background: url('resources/red-circle.svg'), green;
+        float: left;
+        margin: 5px;
+    }
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;!-- This file should contain an svg on top of a background color with every type of blending. --&gt;
+&lt;body&gt;
+    &lt;script&gt;
+        if (window.testRunner)
+            window.testRunner.dumpAsText(true);
+    &lt;/script&gt;
+        &lt;div style=&quot;-webkit-background-blend-mode: normal, normal&quot;&gt;&lt;/div&gt;
+        &lt;div style=&quot;-webkit-background-blend-mode: multiply, normal&quot;&gt;&lt;/div&gt;
+        &lt;div style=&quot;-webkit-background-blend-mode: screen, normal&quot;&gt;&lt;/div&gt;
+        &lt;div style=&quot;-webkit-background-blend-mode: overlay, normal&quot;&gt;&lt;/div&gt;
+        &lt;div style=&quot;-webkit-background-blend-mode: darken, normal&quot;&gt;&lt;/div&gt;
+        &lt;div style=&quot;-webkit-background-blend-mode: lighten, normal&quot;&gt;&lt;/div&gt;
+        &lt;div style=&quot;-webkit-background-blend-mode: color-dodge, normal&quot;&gt;&lt;/div&gt;
+        &lt;div style=&quot;-webkit-background-blend-mode: color-burn, normal&quot;&gt;&lt;/div&gt;
+        &lt;div style=&quot;-webkit-background-blend-mode: hard-light, normal&quot;&gt;&lt;/div&gt;
+        &lt;div style=&quot;-webkit-background-blend-mode: soft-light, normal&quot;&gt;&lt;/div&gt;
+        &lt;div style=&quot;-webkit-background-blend-mode: difference, normal&quot;&gt;&lt;/div&gt;
+        &lt;div style=&quot;-webkit-background-blend-mode: exclusion, normal&quot;&gt;&lt;/div&gt;
+        &lt;div style=&quot;-webkit-background-blend-mode: hue, normal;&quot;&gt;&lt;/div&gt;
+        &lt;div style=&quot;-webkit-background-blend-mode: saturation, normal&quot;&gt;&lt;/div&gt;
+        &lt;div style=&quot;-webkit-background-blend-mode: color, normal&quot;&gt;&lt;/div&gt;
+        &lt;div style=&quot;-webkit-background-blend-mode: luminosity, normal&quot;&gt;&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingresourcesredcirclesvg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/resources/red-circle.svg (0 => 151566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/resources/red-circle.svg                                (rev 0)
+++ trunk/LayoutTests/css3/compositing/resources/red-circle.svg        2013-06-13 18:25:10 UTC (rev 151566)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+&lt;svg xmlns=&quot;http://www.w3.org/2000/svg&quot; version=&quot;1.1&quot; viewBox=&quot;0 0 100 100&quot;&gt;
+  &lt;circle cx=&quot;50&quot; cy=&quot;50&quot; r=&quot;40&quot; stroke=&quot;black&quot; stroke-width=&quot;2&quot; fill=&quot;red&quot;&gt;
+  &lt;/circle&gt;
+&lt;/svg&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3compositingbackgroundblendmodeimagesvgexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-svg-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/background-blend-mode-image-svg-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmaccss3compositingbackgroundblendmodesvgcolorexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/mac/css3/compositing/background-blend-mode-svg-color-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/background-blend-mode-svg-color-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (151565 => 151566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-06-13 18:24:21 UTC (rev 151565)
+++ trunk/Source/WebCore/ChangeLog        2013-06-13 18:25:10 UTC (rev 151566)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2013-06-13  Mihai Tica  &lt;mitica@adobe.com&gt;
</span><span class="cx"> 
</span><ins>+        [CSS Background Blending] Enable CSS Background blending for layers with SVGs.
+
+        The change implies adding the blending parameter for SVGImage
+        https://bugs.webkit.org/show_bug.cgi?id=117588
+
+        Reviewed by Dirk Schulze.
+
+        Tests: css3/compositing/background-blend-mode-image-svg.html
+               css3/compositing/background-blend-mode-svg-color.html
+
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::draw):
+
+2013-06-13  Mihai Tica  &lt;mitica@adobe.com&gt;
+
</ins><span class="cx">         Updating the -webkit-background-blend-mode property dynamically does not trigger a redraw of the element.
</span><span class="cx"> 
</span><span class="cx">         Adding krit's fix: actual blending values should be compared, not the sets.
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsSVGImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/SVGImage.cpp (151565 => 151566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImage.cpp        2013-06-13 18:24:21 UTC (rev 151565)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.cpp        2013-06-13 18:25:10 UTC (rev 151566)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx">     image-&gt;drawPattern(context, scaledSrcRect, unscaledPatternTransform, phase, colorSpace, compositeOp, dstRect);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void SVGImage::draw(GraphicsContext* context, const FloatRect&amp; dstRect, const FloatRect&amp; srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode)
</del><ins>+void SVGImage::draw(GraphicsContext* context, const FloatRect&amp; dstRect, const FloatRect&amp; srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx">     if (!m_page)
</span><span class="cx">         return;
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx">     FrameView* view = frameView();
</span><span class="cx"> 
</span><span class="cx">     GraphicsContextStateSaver stateSaver(*context);
</span><del>-    context-&gt;setCompositeOperation(compositeOp);
</del><ins>+    context-&gt;setCompositeOperation(compositeOp, blendMode);
</ins><span class="cx">     context-&gt;clip(enclosingIntRect(dstRect));
</span><span class="cx">     if (compositeOp != CompositeSourceOver)
</span><span class="cx">         context-&gt;beginTransparencyLayer(1);
</span></span></pre>
</div>
</div>

</body>
</html>