<!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>[200889] 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/200889">200889</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-05-13 15:40:57 -0700 (Fri, 13 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>cross-fade() rendering doesn't match expectation
https://bugs.webkit.org/show_bug.cgi?id=157665
rdar://problem/17917708
Reviewed by Dean Jackson.
Source/WebCore:
Cross-fading two opaque images would result in a non-opaque result in between the endpoints,
probably because <a href="http://trac.webkit.org/projects/webkit/changeset/157045">r157045</a> caused both images to be drawn with srcOver, since drawImage()
clobbers the composite operation in the context.
Fix by passing the composite operation to the drawImage() calls for the non-transparency layer
code path.
Converted css3/images/cross-fade-blending.html into a ref test to test this.
* platform/graphics/CrossfadeGeneratedImage.cpp:
(WebCore::drawCrossfadeSubimage):
LayoutTests:
Make css3/images/cross-fade-blending.html a ref test.
* css3/images/cross-fade-blending-expected.html: Added.
* css3/images/cross-fade-blending-expected.png: Removed.
* css3/images/cross-fade-blending-expected.txt: Removed.
* css3/images/cross-fade-blending.html:
* platform/mac/css3/images/cross-fade-blending-expected.png: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3imagescrossfadeblendinghtml">trunk/LayoutTests/css3/images/cross-fade-blending.html</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="#trunkLayoutTestscss3imagescrossfadeblendingexpectedhtml">trunk/LayoutTests/css3/images/cross-fade-blending-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3imagesresourcesgreen102png">trunk/LayoutTests/css3/images/resources/green-10-2.png</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3imagescrossfadeblendingexpectedpng">trunk/LayoutTests/css3/images/cross-fade-blending-expected.png</a></li>
<li><a href="#trunkLayoutTestscss3imagescrossfadeblendingexpectedtxt">trunk/LayoutTests/css3/images/cross-fade-blending-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3imagescrossfadeblendingexpectedpng">trunk/LayoutTests/platform/mac/css3/images/cross-fade-blending-expected.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200888 => 200889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-13 22:40:52 UTC (rev 200888)
+++ trunk/LayoutTests/ChangeLog 2016-05-13 22:40:57 UTC (rev 200889)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-05-13 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ cross-fade() rendering doesn't match expectation
+ https://bugs.webkit.org/show_bug.cgi?id=157665
+ rdar://problem/17917708
+
+ Reviewed by Dean Jackson.
+
+ Make css3/images/cross-fade-blending.html a ref test.
+
+ * css3/images/cross-fade-blending-expected.html: Added.
+ * css3/images/cross-fade-blending-expected.png: Removed.
+ * css3/images/cross-fade-blending-expected.txt: Removed.
+ * css3/images/cross-fade-blending.html:
+ * platform/mac/css3/images/cross-fade-blending-expected.png: Removed.
+
+2016-05-13 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Unprefix -webkit-cross-fade()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157632
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestscss3imagescrossfadeblendingexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/images/cross-fade-blending-expected.html (0 => 200889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/images/cross-fade-blending-expected.html (rev 0)
+++ trunk/LayoutTests/css3/images/cross-fade-blending-expected.html 2016-05-13 22:40:57 UTC (rev 200889)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<html>
+<style>
+div
+{
+ width: 200px;
+ height: 100px;
+}
+
+.image
+{
+ background-image: url(resources/green-10.png);
+}
+</style>
+<div class="image"></div>
+<div class="image"></div>
+<div class="image"></div>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3imagescrossfadeblendingexpectedpng"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/css3/images/cross-fade-blending-expected.png (200888 => 200889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/images/cross-fade-blending-expected.png 2016-05-13 22:40:52 UTC (rev 200888)
+++ trunk/LayoutTests/css3/images/cross-fade-blending-expected.png 2016-05-13 22:40:57 UTC (rev 200889)
</span><span class="lines">@@ -1,7 +0,0 @@
</span><del>-\x89PNG
-
--IHDR X')tEXtchecksumbc04d27321e03146cf94bbc61b154f61\x9D3\xB1bKGD\xFF\xFF\xFF\xA0\xBD\xA7\x93
-\xC1IDATx\x9C\xEDܱ-\xC40 1;\xC8\xFE++\xA4;\xE4?٪QyP\xA1=3 \x80\xCE\xF5\xEBN#\xB0b &\xB0b &\xB0b v\xBF-\xF6\xDA_\xEE\xC1\x9F\x98\xE5\xEF\xE7s\xC1\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x
80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80
\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88\xDDo\x83Y\xF3\xE5 \xC7p\xC1\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0
\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0
\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x
88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88
,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88 ,\x80\x98\xC0\x88=:\xE4 \xAF>\xF9z\x9FIEND\xAEB`\x82
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3imagescrossfadeblendingexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/css3/images/cross-fade-blending-expected.txt (200888 => 200889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/images/cross-fade-blending-expected.txt 2016-05-13 22:40:52 UTC (rev 200888)
+++ trunk/LayoutTests/css3/images/cross-fade-blending-expected.txt 2016-05-13 22:40:57 UTC (rev 200889)
</span><span class="lines">@@ -1,8 +0,0 @@
</span><del>-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (0,0) size 200x100
- RenderBlock {DIV} at (0,100) size 200x100 [bgcolor=#000000]
- RenderBlock {DIV} at (0,0) size 200x100
</del></span></pre></div>
<a id="trunkLayoutTestscss3imagescrossfadeblendinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/images/cross-fade-blending.html (200888 => 200889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/images/cross-fade-blending.html 2016-05-13 22:40:52 UTC (rev 200888)
+++ trunk/LayoutTests/css3/images/cross-fade-blending.html 2016-05-13 22:40:57 UTC (rev 200889)
</span><span class="lines">@@ -2,16 +2,22 @@
</span><span class="cx"> <style>
</span><span class="cx"> div
</span><span class="cx"> {
</span><del>- width: 200px;
- height: 100px;
</del><ins>+ width: 200px;
+ height: 100px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-div.crossfade
</del><ins>+.crossfade1
</ins><span class="cx"> {
</span><del>- background-image: -webkit-cross-fade(url(resources/green-10.png), url(resources/green-10.png), 50%);
</del><ins>+ background-image: cross-fade(url(resources/green-10.png), url(resources/green-10.png), 50%);
</ins><span class="cx"> }
</span><ins>+
+.crossfade2
+{
+ background-image: cross-fade(url(resources/green-10.png), url(resources/green-10-2.png), 50%);
+}
</ins><span class="cx"> </style>
</span><del>-<!--The first cross-fade should appear as a 100% green square, 200x200px.-->
-<div class="crossfade"></div>
-<div style="background-color: black"><div class="crossfade"></div></div>
</del><ins>+<!-- All rectangles should look the same-->
+<div class="crossfade1"></div>
+<div class="crossfade2"></div>
+<div style="background-color: black"><div class="crossfade2"></div></div>
</ins><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestscss3imagesresourcesgreen102png"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/css3/images/resources/green-10-2.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/css3/images/resources/green-10-2.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmaccss3imagescrossfadeblendingexpectedpng"></a>
<div class="binary"><h4>Deleted: trunk/LayoutTests/platform/mac/css3/images/cross-fade-blending-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200888 => 200889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-13 22:40:52 UTC (rev 200888)
+++ trunk/Source/WebCore/ChangeLog 2016-05-13 22:40:57 UTC (rev 200889)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2016-05-13 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ cross-fade() rendering doesn't match expectation
+ https://bugs.webkit.org/show_bug.cgi?id=157665
+ rdar://problem/17917708
+
+ Reviewed by Dean Jackson.
+
+ Cross-fading two opaque images would result in a non-opaque result in between the endpoints,
+ probably because r157045 caused both images to be drawn with srcOver, since drawImage()
+ clobbers the composite operation in the context.
+
+ Fix by passing the composite operation to the drawImage() calls for the non-transparency layer
+ code path.
+
+ Converted css3/images/cross-fade-blending.html into a ref test to test this.
+
+ * platform/graphics/CrossfadeGeneratedImage.cpp:
+ (WebCore::drawCrossfadeSubimage):
+
+2016-05-13 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Unprefix -webkit-cross-fade()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157632
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsCrossfadeGeneratedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp (200888 => 200889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp 2016-05-13 22:40:52 UTC (rev 200888)
+++ trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp 2016-05-13 22:40:57 UTC (rev 200889)
</span><span class="lines">@@ -50,18 +50,21 @@
</span><span class="cx"> bool useTransparencyLayer = image.isSVGImage();
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(context);
</span><ins>+
+ CompositeOperator drawImageOperation = operation;
</ins><span class="cx">
</span><del>- context.setCompositeOperation(operation);
-
- if (useTransparencyLayer)
</del><ins>+ if (useTransparencyLayer) {
+ context.setCompositeOperation(operation);
</ins><span class="cx"> context.beginTransparencyLayer(opacity);
</span><del>- else
</del><ins>+ drawImageOperation = CompositeSourceOver;
+ } else
</ins><span class="cx"> context.setAlpha(opacity);
</span><span class="cx">
</span><span class="cx"> if (targetSize != imageSize)
</span><span class="cx"> context.scale(FloatSize(targetSize.width() / imageSize.width(), targetSize.height() / imageSize.height()));
</span><del>- context.drawImage(image, IntPoint());
</del><span class="cx">
</span><ins>+ context.drawImage(image, IntPoint(), ImagePaintingOptions(drawImageOperation));
+
</ins><span class="cx"> if (useTransparencyLayer)
</span><span class="cx"> context.endTransparencyLayer();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>