<!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>[162348] 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/162348">162348</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-20 08:36:19 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore: [CSS Background Blending] Background layer with -webkit-cross-fade doesn't blend
when having -webkit-background-blending applied. Turns out the problem was
the blending parameter not being passed to WebCore::CrossfadeGeneratedImage::draw
https://bugs.webkit.org/show_bug.cgi?id=126887
Patch by Mihai Tica <mitica@adobe.com> on 2014-01-20
Reviewed by Dirk Schulze.
Test: css3/compositing/background-blend-mode-crossfade-image.html
* platform/graphics/CrossfadeGeneratedImage.cpp:
(WebCore::CrossfadeGeneratedImage::draw): set blendMode on context.
LayoutTests: Reapply:
[CSS Background Blending] Background layer with -webkit-cross-fade doesn't blend
when having -webkit-background-blending applied. Tests now use SVG rects, instead
of circles.
https://bugs.webkit.org/show_bug.cgi?id=126887
Patch by Mihai Tica <mitica@adobe.com> on 2014-01-20
Reviewed by Dirk Schulze.
* css3/compositing/background-blend-mode-crossfade-image-expected.html:
* css3/compositing/background-blend-mode-crossfade-image.html:
* platform/efl/TestExpectations: Pass efl as blendMode is not implemented.
* platform/mac/TestExpectations: Mark added test as ImageOnlyFailure due to slight differences between the result and the blending formula.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsCrossfadeGeneratedImagecpp">trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3compositingbackgroundblendmodecrossfadeimageexpectedhtml">trunk/LayoutTests/css3/compositing/background-blend-mode-crossfade-image-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingbackgroundblendmodecrossfadeimagehtml">trunk/LayoutTests/css3/compositing/background-blend-mode-crossfade-image.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (162347 => 162348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-20 16:36:15 UTC (rev 162347)
+++ trunk/LayoutTests/ChangeLog 2014-01-20 16:36:19 UTC (rev 162348)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-01-20 Mihai Tica <mitica@adobe.com>
+
+ Reapply:
+ [CSS Background Blending] Background layer with -webkit-cross-fade doesn't blend
+ when having -webkit-background-blending applied. Tests now use SVG rects, instead
+ of circles.
+
+ https://bugs.webkit.org/show_bug.cgi?id=126887
+ Reviewed by Dirk Schulze.
+
+ * css3/compositing/background-blend-mode-crossfade-image-expected.html:
+ * css3/compositing/background-blend-mode-crossfade-image.html:
+ * platform/efl/TestExpectations: Pass efl as blendMode is not implemented.
+ * platform/mac/TestExpectations: Mark added test as ImageOnlyFailure due to slight differences between the result and the blending formula.
+
</ins><span class="cx"> 2014-01-16 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Simplify grid-columns-rows-get-set{-multiple}.html tests
</span></span></pre></div>
<a id="trunkLayoutTestscss3compositingbackgroundblendmodecrossfadeimageexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/background-blend-mode-crossfade-image-expected.html (0 => 162348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/background-blend-mode-crossfade-image-expected.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/background-blend-mode-crossfade-image-expected.html 2014-01-20 16:36:19 UTC (rev 162348)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE HTML>
+
+<!-- This file should contain two elements, each containing a cross-faded image between two rectangles, blended with a solid yellow background color.
+The test passes if you can see two green rectangles drawn on the screen. The test fails if the rectangles are drawn with red. -->
+
+<style>
+ div {
+ margin: 5px;
+ width: 130px;
+ height: 130px;
+ background: #0F0;
+ }
+</style>
+
+<div></div>
+<div></div>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingbackgroundblendmodecrossfadeimagehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/background-blend-mode-crossfade-image.html (0 => 162348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/background-blend-mode-crossfade-image.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/background-blend-mode-crossfade-image.html 2014-01-20 16:36:19 UTC (rev 162348)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE HTML>
+
+<!-- This file should contain two elements, each containing a cross-faded image between two rectangles, blended with a solid yellow background color.
+The test passes if you can see two green rectangles drawn on the screen. The test fails if the rectangles are drawn with red. -->
+
+<style>
+ div {
+ margin: 5px;
+ width: 130px;
+ height: 130px;
+ background: -webkit-cross-fade(url('data:image/svg+xml;utf8, \
+ <svg xmlns="http://www.w3.org/2000/svg" width="100" height="100"> \
+ <rect width="100" height="100" fill="#F00"/> \
+ </svg>'
+ ), url('data:image/svg+xml;utf8, \
+ <svg xmlns="http://www.w3.org/2000/svg" width="100" height="100"> \
+ <rect width="100" height="100" fill="#F00"/> \
+ </svg>'
+ ), 100%) no-repeat 0 0 /100% 100%, #FF0;
+ -webkit-background-blend-mode: difference, normal
+ }
+</style>
+
+<!-- Test the software path. -->
+<div></div>
+
+<!-- Test the hardware path. -->
+<div style="-webkit-transform: translateZ(0);"></div>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/TestExpectations (162347 => 162348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/TestExpectations 2014-01-20 16:36:15 UTC (rev 162347)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2014-01-20 16:36:19 UTC (rev 162348)
</span><span class="lines">@@ -492,6 +492,7 @@
</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/126887 css3/compositing/background-blend-mode-crossfade-image.html [ Skip ]
</ins><span class="cx"> webkit.org/b/99200 css3/compositing/blend-mode-layers.html [ Skip ]
</span><span class="cx"> webkit.org/b/99200 css3/compositing/blend-mode-overflow.html [ Skip ]
</span><span class="cx"> webkit.org/b/99200 css3/compositing/blend-mode-reflection.html [ Skip ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (162347 => 162348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2014-01-20 16:36:15 UTC (rev 162347)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2014-01-20 16:36:19 UTC (rev 162348)
</span><span class="lines">@@ -661,6 +661,9 @@
</span><span class="cx"> css3/filters/composited-during-transition-layertree.html
</span><span class="cx"> webkit.org/b/95622 css3/filters/composited-during-animation-layertree.html [ Pass Failure ]
</span><span class="cx">
</span><ins>+# Blending result is slightly different than the formula.
+webkit.org/b/126887 css3/compositing/background-blend-mode-crossfade-image.html [ ImageOnlyFailure Pass ]
+
</ins><span class="cx"> # --- Custom Filters ---
</span><span class="cx"> # The following 5 tests are currently skipped on Mac for slight color differences,
</span><span class="cx"> # please see the relevant bug: http://webkit.org/b/107487
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162347 => 162348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-20 16:36:15 UTC (rev 162347)
+++ trunk/Source/WebCore/ChangeLog 2014-01-20 16:36:19 UTC (rev 162348)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-01-20 Mihai Tica <mitica@adobe.com>
+
+ [CSS Background Blending] Background layer with -webkit-cross-fade doesn't blend
+ when having -webkit-background-blending applied. Turns out the problem was
+ the blending parameter not being passed to WebCore::CrossfadeGeneratedImage::draw
+
+ https://bugs.webkit.org/show_bug.cgi?id=126887
+
+ Reviewed by Dirk Schulze.
+
+ Test: css3/compositing/background-blend-mode-crossfade-image.html
+
+ * platform/graphics/CrossfadeGeneratedImage.cpp:
+ (WebCore::CrossfadeGeneratedImage::draw): set blendMode on context.
+
</ins><span class="cx"> 2013-11-22 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> Null-pointer dereference in WebCore::CSSValue::isPrimitiveValue
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsCrossfadeGeneratedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp (162347 => 162348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp 2014-01-20 16:36:15 UTC (rev 162347)
+++ trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp 2014-01-20 16:36:19 UTC (rev 162348)
</span><span class="lines">@@ -83,10 +83,10 @@
</span><span class="cx"> context->endTransparencyLayer();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CrossfadeGeneratedImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode, ImageOrientationDescription)
</del><ins>+void CrossfadeGeneratedImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
</ins><span class="cx"> {
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*context);
</span><del>- context->setCompositeOperation(compositeOp);
</del><ins>+ context->setCompositeOperation(compositeOp, blendMode);
</ins><span class="cx"> context->clip(dstRect);
</span><span class="cx"> context->translate(dstRect.x(), dstRect.y());
</span><span class="cx"> if (dstRect.size() != srcRect.size())
</span></span></pre>
</div>
</div>
</body>
</html>