<!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>[187859] releases/WebKitGTK/webkit-2.8</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/187859">187859</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-04 06:26:32 -0700 (Tue, 04 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/187171">r187171</a> - [WinCairo] SVG path not rendered with all-zero dasharray
https://bugs.webkit.org/show_bug.cgi?id=146997
Patch by Jinyoung Hur <hur.ims@navercorp.com> on 2015-07-22
Reviewed by Martin Robinson.
Source/WebCore:
All-zero dash array should not be passed to cairo_set_dash() as an argument, because it will cause an internal Cairo error.
Rather call cairo_set_dash() with num_dashes=0 to disable dash line.
Tests: fast/canvas/canvas-lineDash.html
svg/custom/zero-dasharray.html
* platform/graphics/cairo/GraphicsContextCairo.cpp:
(WebCore::GraphicsContext::setLineDash):
LayoutTests:
Canvas 2D context and SVG stroke tests with all-zero dash array are added.
* fast/canvas/canvas-lineDash-expected.txt:
* fast/canvas/script-tests/canvas-lineDash.js:
* svg/custom/zero-dasharray.html: Added
* svg/custom/zero-dasharray-expected.html: Added</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfastcanvascanvaslineDashexpectedtxt">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/canvas/canvas-lineDash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfastcanvasscripttestscanvaslineDashjs">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/canvas/script-tests/canvas-lineDash.js</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformgraphicscairoGraphicsContextCairocpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestssvgcustomzerodasharrayexpectedhtml">releases/WebKitGTK/webkit-2.8/LayoutTests/svg/custom/zero-dasharray-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestssvgcustomzerodasharrayhtml">releases/WebKitGTK/webkit-2.8/LayoutTests/svg/custom/zero-dasharray.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (187858 => 187859)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-08-04 13:24:06 UTC (rev 187858)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-08-04 13:26:32 UTC (rev 187859)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-07-22 Jinyoung Hur <hur.ims@navercorp.com>
+
+ [WinCairo] SVG path not rendered with all-zero dasharray
+ https://bugs.webkit.org/show_bug.cgi?id=146997
+
+ Reviewed by Martin Robinson.
+
+ Canvas 2D context and SVG stroke tests with all-zero dash array are added.
+
+ * fast/canvas/canvas-lineDash-expected.txt:
+ * fast/canvas/script-tests/canvas-lineDash.js:
+ * svg/custom/zero-dasharray.html: Added
+ * svg/custom/zero-dasharray-expected.html: Added
+
</ins><span class="cx"> 2015-07-22 Mark Dittmer <mark.s.dittmer@gmail.com>
</span><span class="cx">
</span><span class="cx"> New test: Object.create(window).location will trigger a crash when toJSDOMWindow() returns NULL on an object that have the JS DOM Window in its prototype chain.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfastcanvascanvaslineDashexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/canvas/canvas-lineDash-expected.txt (187858 => 187859)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/canvas/canvas-lineDash-expected.txt 2015-08-04 13:24:06 UTC (rev 187858)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/canvas/canvas-lineDash-expected.txt 2015-08-04 13:26:32 UTC (rev 187859)
</span><span class="lines">@@ -40,6 +40,14 @@
</span><span class="cx"> PASS getPixel(105,40) is [0,255,0,255]
</span><span class="cx"> PASS getPixel(90,35) is [0,0,0,0]
</span><span class="cx"> PASS getPixel(90,25) is [0,255,0,255]
</span><ins>+PASS getPixel(145,10) is [0,255,0,255]
+PASS getPixel(155,10) is [0,255,0,255]
+PASS getPixel(160,25) is [0,255,0,255]
+PASS getPixel(160,35) is [0,255,0,255]
+PASS getPixel(145,40) is [0,255,0,255]
+PASS getPixel(135,40) is [0,255,0,255]
+PASS getPixel(130,25) is [0,255,0,255]
+PASS getPixel(130,15) is [0,255,0,255]
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfastcanvasscripttestscanvaslineDashjs"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/canvas/script-tests/canvas-lineDash.js (187858 => 187859)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/canvas/script-tests/canvas-lineDash.js 2015-08-04 13:24:06 UTC (rev 187858)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/canvas/script-tests/canvas-lineDash.js 2015-08-04 13:26:32 UTC (rev 187859)
</span><span class="lines">@@ -104,3 +104,18 @@
</span><span class="cx"> pixelShouldBe(90, 35, [0, 0, 0, 0]);
</span><span class="cx"> pixelShouldBe(90, 25, [0, 255, 0, 255]);
</span><span class="cx">
</span><ins>+// Verify all-zero dash rendering.
+ctx.setLineDash([0, 0]);
+ctx.lineDashOffset = 0;
+ctx.lineWidth = 4; // To make the test immune to plaform anti-aliasing discrepancies.
+ctx.strokeStyle = '#00FF00';
+ctx.strokeRect(130.5, 10.5, 30, 30);
+
+pixelShouldBe(145, 10, [0, 255, 0, 255]);
+pixelShouldBe(155, 10, [0, 255, 0, 255]);
+pixelShouldBe(160, 25, [0, 255, 0, 255]);
+pixelShouldBe(160, 35, [0, 255, 0, 255]);
+pixelShouldBe(145, 40, [0, 255, 0, 255]);
+pixelShouldBe(135, 40, [0, 255, 0, 255]);
+pixelShouldBe(130, 25, [0, 255, 0, 255]);
+pixelShouldBe(130, 15, [0, 255, 0, 255]);
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestssvgcustomzerodasharrayexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/svg/custom/zero-dasharray-expected.html (0 => 187859)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/svg/custom/zero-dasharray-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/svg/custom/zero-dasharray-expected.html 2015-08-04 13:26:32 UTC (rev 187859)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <body>
+ <svg version="1.1" baseProfile="full" xmlns="http://www.w3.org/2000/svg" width="100%" height="100%">
+ <rect id="rect" fill="none" stroke="green" stroke-width="10" stroke-dasharray:none width="100" height="100"/>
+ </svg>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestssvgcustomzerodasharrayhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/svg/custom/zero-dasharray.html (0 => 187859)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/svg/custom/zero-dasharray.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/svg/custom/zero-dasharray.html 2015-08-04 13:26:32 UTC (rev 187859)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <body>
+ <svg version="1.1" baseProfile="full" xmlns="http://www.w3.org/2000/svg" width="100%" height="100%">
+ <rect id="rect" fill="none" stroke="green" stroke-width="10" stroke-dasharray="0" width="100" height="100"/>
+ </svg>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (187858 => 187859)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-08-04 13:24:06 UTC (rev 187858)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-08-04 13:26:32 UTC (rev 187859)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-07-22 Jinyoung Hur <hur.ims@navercorp.com>
+
+ [WinCairo] SVG path not rendered with all-zero dasharray
+ https://bugs.webkit.org/show_bug.cgi?id=146997
+
+ Reviewed by Martin Robinson.
+
+ All-zero dash array should not be passed to cairo_set_dash() as an argument, because it will cause an internal Cairo error.
+ Rather call cairo_set_dash() with num_dashes=0 to disable dash line.
+
+ Tests: fast/canvas/canvas-lineDash.html
+ svg/custom/zero-dasharray.html
+
+ * platform/graphics/cairo/GraphicsContextCairo.cpp:
+ (WebCore::GraphicsContext::setLineDash):
+
</ins><span class="cx"> 2015-07-22 Mark Dittmer <mark.s.dittmer@gmail.com>
</span><span class="cx">
</span><span class="cx"> Fix toJSDOMWindow() in the case of an object that has the actual JS DOM window in its prototype chain.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformgraphicscairoGraphicsContextCairocpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (187858 => 187859)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2015-08-04 13:24:06 UTC (rev 187858)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2015-08-04 13:26:32 UTC (rev 187859)
</span><span class="lines">@@ -895,9 +895,21 @@
</span><span class="cx"> cairo_set_line_cap(platformContext()->cr(), cairoCap);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline bool isDashArrayAllZero(const DashArray& dashes)
+{
+ for (auto& dash : dashes) {
+ if (dash)
+ return false;
+ }
+ return true;
+}
+
</ins><span class="cx"> void GraphicsContext::setLineDash(const DashArray& dashes, float dashOffset)
</span><span class="cx"> {
</span><del>- cairo_set_dash(platformContext()->cr(), dashes.data(), dashes.size(), dashOffset);
</del><ins>+ if (isDashArrayAllZero(dashes))
+ cairo_set_dash(platformContext()->cr(), 0, 0, 0);
+ else
+ cairo_set_dash(platformContext()->cr(), dashes.data(), dashes.size(), dashOffset);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::setLineJoin(LineJoin lineJoin)
</span></span></pre>
</div>
</div>
</body>
</html>