<!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>[166746] 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/166746">166746</a></dd>
<dt>Author</dt> <dd>krit@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-03 14:44:54 -0700 (Thu, 03 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CG] Canvas lineDashOffset does not handle negative numbers correctly
https://bugs.webkit.org/show_bug.cgi?id=80560
Reviewed by Dean Jackson.
Source/WebCore:
CG ignores negative dash array offsets. Check if we have a negative offset, if yes
then calculate the length of the dash array and modulo the dash array offset with
the dash array length.
Test: fast/canvas/canvas-negative-lineDashOffset.html
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::setLineDash):
LayoutTests:
Test correct rendering of negative offset for Canvas dash arrays.
* fast/canvas/canvas-negative-lineDashOffset-expected.txt: Added.
* fast/canvas/canvas-negative-lineDashOffset.html: Added.
* fast/canvas/script-tests/canvas-negative-lineDashOffset.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="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcanvascanvasnegativelineDashOffsetexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-negative-lineDashOffset-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvasnegativelineDashOffsethtml">trunk/LayoutTests/fast/canvas/canvas-negative-lineDashOffset.html</a></li>
<li><a href="#trunkLayoutTestsfastcanvasscripttestscanvasnegativelineDashOffsetjs">trunk/LayoutTests/fast/canvas/script-tests/canvas-negative-lineDashOffset.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166745 => 166746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-03 21:40:49 UTC (rev 166745)
+++ trunk/LayoutTests/ChangeLog 2014-04-03 21:44:54 UTC (rev 166746)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-04-03 Dirk Schulze <krit@webkit.org>
+
+ [CG] Canvas lineDashOffset does not handle negative numbers correctly
+ https://bugs.webkit.org/show_bug.cgi?id=80560
+
+ Reviewed by Dean Jackson.
+
+ Test correct rendering of negative offset for Canvas dash arrays.
+
+ * fast/canvas/canvas-negative-lineDashOffset-expected.txt: Added.
+ * fast/canvas/canvas-negative-lineDashOffset.html: Added.
+ * fast/canvas/script-tests/canvas-negative-lineDashOffset.js: Added.
+ (dataToArray):
+ (getPixel):
+ (pixelShouldBe):
+
</ins><span class="cx"> 2014-04-03 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Continuations casting issue.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasnegativelineDashOffsetexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-negative-lineDashOffset-expected.txt (0 => 166746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-negative-lineDashOffset-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-negative-lineDashOffset-expected.txt 2014-04-03 21:44:54 UTC (rev 166746)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Test negative values for lineDashOffset
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS ctx.lineDashOffset is -100
+PASS getPixel(50,100) is [0,0,0,0]
+PASS getPixel(150,100) is [0,255,0,255]
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasnegativelineDashOffsethtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-negative-lineDashOffset.html (0 => 166746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-negative-lineDashOffset.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-negative-lineDashOffset.html 2014-04-03 21:44:54 UTC (rev 166746)
</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-negative-lineDashOffset.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvasscripttestscanvasnegativelineDashOffsetjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/script-tests/canvas-negative-lineDashOffset.js (0 => 166746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/script-tests/canvas-negative-lineDashOffset.js (rev 0)
+++ trunk/LayoutTests/fast/canvas/script-tests/canvas-negative-lineDashOffset.js 2014-04-03 21:44:54 UTC (rev 166746)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+description("Test negative values for lineDashOffset");
+
+var canvas = document.createElement('canvas');
+document.body.appendChild(canvas);
+canvas.setAttribute('width', '200');
+canvas.setAttribute('height', '200');
+var ctx = canvas.getContext('2d');
+
+ctx.lineWidth = 200;
+ctx.setLineDash([100,100]);
+ctx.strokeStyle = "rgb(0,255,0)";
+ctx.moveTo(0,100);
+ctx.lineTo(200,100);
+ctx.lineDashOffset = -100;
+ctx.stroke();
+
+// Verify value.
+shouldBe('ctx.lineDashOffset', '-100');
+
+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+"]");
+}
+
+pixelShouldBe(50,100,[0,0,0,0]);
+pixelShouldBe(150,100,[0,255,0,255]);
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166745 => 166746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-03 21:40:49 UTC (rev 166745)
+++ trunk/Source/WebCore/ChangeLog 2014-04-03 21:44:54 UTC (rev 166746)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-04-03 Dirk Schulze <krit@webkit.org>
+
+ [CG] Canvas lineDashOffset does not handle negative numbers correctly
+ https://bugs.webkit.org/show_bug.cgi?id=80560
+
+ Reviewed by Dean Jackson.
+
+ CG ignores negative dash array offsets. Check if we have a negative offset, if yes
+ then calculate the length of the dash array and modulo the dash array offset with
+ the dash array length.
+
+ Test: fast/canvas/canvas-negative-lineDashOffset.html
+
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::GraphicsContext::setLineDash):
+
</ins><span class="cx"> 2014-04-03 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: fast/css/relative-positioned-block-nested-with-inline-parent-multiple-descendant-blocks-dynamic.html broken
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (166745 => 166746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-04-03 21:40:49 UTC (rev 166745)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-04-03 21:44:54 UTC (rev 166746)
</span><span class="lines">@@ -1183,6 +1183,13 @@
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::setLineDash(const DashArray& dashes, float dashOffset)
</span><span class="cx"> {
</span><ins>+ if (dashOffset < 0) {
+ float length = 0;
+ for (size_t i = 0; i < dashes.size(); ++i)
+ length += static_cast<float>(dashes[i]);
+ if (length)
+ dashOffset = fmod(dashOffset, length) + length;
+ }
</ins><span class="cx"> CGContextSetLineDash(platformContext(), dashOffset, dashes.data(), dashes.size());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>