<!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>[166785] 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/166785">166785</a></dd>
<dt>Author</dt> <dd>krit@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-04 09:41:09 -0700 (Fri, 04 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Gradient offsets are off if compositing operator != source-over
https://bugs.webkit.org/show_bug.cgi?id=129791
Reviewed by Andreas Kling.
Source/WebCore:
Instead of transforming the path before drawing it on the context,
the whole context should be transformed. This will make the gradient
map correctly to the context space.
Test: fast/canvas/canvas-gradient-on-compositing.html
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::fullCanvasCompositedFill):
LayoutTests:
Test that the gradient space maps correctly to context space after
applying compositing mode.
* fast/canvas/canvas-gradient-on-compositing-expected.txt: Added.
* fast/canvas/canvas-gradient-on-compositing.html: Added.
* fast/canvas/script-tests/canvas-gradient-on-compositing.js: Added.
(dataToArray):
(getPixel):
(pixelShouldBe):</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="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcanvascanvasgradientoncompositingexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-gradient-on-compositing-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvasgradientoncompositinghtml">trunk/LayoutTests/fast/canvas/canvas-gradient-on-compositing.html</a></li>
<li><a href="#trunkLayoutTestsfastcanvasscripttestscanvasgradientoncompositingjs">trunk/LayoutTests/fast/canvas/script-tests/canvas-gradient-on-compositing.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166784 => 166785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-04 16:30:18 UTC (rev 166784)
+++ trunk/LayoutTests/ChangeLog 2014-04-04 16:41:09 UTC (rev 166785)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-04-04 Dirk Schulze <krit@webkit.org>
+
+ Gradient offsets are off if compositing operator != source-over
+ https://bugs.webkit.org/show_bug.cgi?id=129791
+
+ Reviewed by Andreas Kling.
+
+ Test that the gradient space maps correctly to context space after
+ applying compositing mode.
+
+ * fast/canvas/canvas-gradient-on-compositing-expected.txt: Added.
+ * fast/canvas/canvas-gradient-on-compositing.html: Added.
+ * fast/canvas/script-tests/canvas-gradient-on-compositing.js: Added.
+ (dataToArray):
+ (getPixel):
+ (pixelShouldBe):
+
</ins><span class="cx"> 2014-04-04 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel rendering: Move background images to device pixel boundaries.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasgradientoncompositingexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-gradient-on-compositing-expected.txt (0 => 166785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-gradient-on-compositing-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-gradient-on-compositing-expected.txt 2014-04-04 16:41:09 UTC (rev 166785)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Test that compositing does not influence the gradient space to context space mapping.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS getPixel(125,50) is [0,0,0,0]
+PASS getPixel(175,50) is [0,128,0,255]
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasgradientoncompositinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-gradient-on-compositing.html (0 => 166785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-gradient-on-compositing.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-gradient-on-compositing.html 2014-04-04 16:41:09 UTC (rev 166785)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/canvas-gradient-on-compositing.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvasscripttestscanvasgradientoncompositingjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/script-tests/canvas-gradient-on-compositing.js (0 => 166785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/script-tests/canvas-gradient-on-compositing.js (rev 0)
+++ trunk/LayoutTests/fast/canvas/script-tests/canvas-gradient-on-compositing.js 2014-04-04 16:41:09 UTC (rev 166785)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+description("Test that compositing does not influence the gradient space to context space mapping.");
+var ctx = document.createElement('canvas').getContext('2d');
+
+function dataToArray(data) {
+ var result = new Array(data.length)
+ for (var i = 0; i < data.length; i++)
+ result[i] = data[i];
+ return result;
+}
+
+function getPixel(x, y) {
+ var data = ctx.getImageData(x,y,1,1);
+ if (!data) // getImageData failed, which should never happen
+ return [-1,-1,-1,-1];
+ return dataToArray(data.data);
+}
+
+function pixelShouldBe(x, y, colour) {
+ shouldBe("getPixel(" + [x, y] +")", "["+colour+"]");
+}
+
+var grad = ctx.createLinearGradient(100,0,200,0);
+grad.addColorStop(0, 'rgba(0,0,0,0)');
+grad.addColorStop(0.5, 'rgba(0,0,0,0)');
+grad.addColorStop(0.5, 'rgba(0,128,0,1)');
+grad.addColorStop(1, 'rgba(0,128,0,1)');
+
+ctx.fillStyle = "rgba(0,0,0,0)";
+ctx.beginPath();
+ctx.moveTo(100,0);
+ctx.rect(100,0,100,100);
+ctx.closePath();
+ctx.fill();
+
+ctx.globalCompositeOperation = 'destination-atop';
+
+ctx.fillStyle = grad;
+ctx.beginPath();
+ctx.moveTo(100,0);
+ctx.rect(100,0,100,100);
+ctx.closePath();
+ctx.fill();
+
+pixelShouldBe(125,50,[0,0,0,0]);
+pixelShouldBe(175,50,[0,128,0,255]);
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166784 => 166785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-04 16:30:18 UTC (rev 166784)
+++ trunk/Source/WebCore/ChangeLog 2014-04-04 16:41:09 UTC (rev 166785)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-04-04 Dirk Schulze <krit@webkit.org>
+
+ Gradient offsets are off if compositing operator != source-over
+ https://bugs.webkit.org/show_bug.cgi?id=129791
+
+ Reviewed by Andreas Kling.
+
+ Instead of transforming the path before drawing it on the context,
+ the whole context should be transformed. This will make the gradient
+ map correctly to the context space.
+
+ Test: fast/canvas/canvas-gradient-on-compositing.html
+
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::fullCanvasCompositedFill):
+
</ins><span class="cx"> 2014-04-04 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel rendering: Move background images to device pixel boundaries.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (166784 => 166785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-04-04 16:30:18 UTC (rev 166784)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-04-04 16:41:09 UTC (rev 166785)
</span><span class="lines">@@ -1679,10 +1679,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Path path = transformAreaToDevice(area);
</span><del>- path.translate(FloatSize(-bufferRect.x(), -bufferRect.y()));
-
</del><span class="cx"> buffer->context()->setCompositeOperation(CompositeSourceOver);
</span><ins>+ buffer->context()->translate(FloatSize(-bufferRect.x(), -bufferRect.y()));
</ins><span class="cx"> modifiableState().m_fillStyle.applyFillColor(buffer->context());
</span><ins>+
</ins><span class="cx"> buffer->context()->fillPath(path);
</span><span class="cx">
</span><span class="cx"> compositeBuffer(buffer.get(), bufferRect, state().m_globalComposite);
</span></span></pre>
</div>
</div>
</body>
</html>