<!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>[38364] 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/38364">38364</a></dd>
<dt>Author</dt> <dd>krit@webkit.org</dd>
<dt>Date</dt> <dd>2008-11-12 23:17:53 -0800 (Wed, 12 Nov 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>2008-11-12  Dirk Schulze  &lt;vbs85@gmx.de&gt;

WebCore:

        Reviewed Darin Adler.

        use strokeColor.alpha() instead of fillColor.alpha()
        on GraphicsContext::strokePath()

        [Canvas] Transparent fillStyle stops line rendering
        https://bugs.webkit.org/show_bug.cgi?id=21888

        Test: fast/canvas/canvas-stroke-empty-fill.html

        * ChangeLog:
        * platform/graphics/cg/GraphicsContextCG.cpp:
        (WebCore::GraphicsContext::strokePath):

LayoutTests:

        Reviewed by Darin Adler.

        Check behavior of canvas.stroke() on transparent fillStyle()

        * fast/canvas/canvas-stroke-empty-fill-expected.txt: Added.
        * fast/canvas/canvas-stroke-empty-fill.html: Added.
        * fast/canvas/canvas-stroke-empty-fill.js: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcanvascanvasstrokeemptyfillexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-stroke-empty-fill-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvasstrokeemptyfillhtml">trunk/LayoutTests/fast/canvas/canvas-stroke-empty-fill.html</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvasstrokeemptyfilljs">trunk/LayoutTests/fast/canvas/canvas-stroke-empty-fill.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (38363 => 38364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2008-11-13 07:17:17 UTC (rev 38363)
+++ trunk/LayoutTests/ChangeLog        2008-11-13 07:17:53 UTC (rev 38364)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2008-11-12  Dirk Schulze  &lt;vbs85@gmx.de&gt;
+
+        Reviewed by Darin Adler.
+
+        Check behavior of canvas.stroke() on transparent fillStyle()
+
+        * fast/canvas/canvas-stroke-empty-fill-expected.txt: Added.
+        * fast/canvas/canvas-stroke-empty-fill.html: Added.
+        * fast/canvas/canvas-stroke-empty-fill.js: Added.
+
</ins><span class="cx"> 2008-11-12  Pierre-Olivier Latour  &lt;pol@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dan Bernstein.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasstrokeemptyfillexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-stroke-empty-fill-expected.txt (0 => 38364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-stroke-empty-fill-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-stroke-empty-fill-expected.txt        2008-11-13 07:17:53 UTC (rev 38364)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Series of tests to ensure correct behaviour for stroke() on an empty fillStyle() (alpha=0)
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+PASS imgdata[4] is 0
+PASS imgdata[5] is 128
+PASS imgdata[6] is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasstrokeemptyfillhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-stroke-empty-fill.html (0 => 38364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-stroke-empty-fill.html                                (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-stroke-empty-fill.html        2008-11-13 07:17:53 UTC (rev 38364)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+&lt;!DOCTYPE HTML PUBLIC &quot;-//IETF//DTD HTML//EN&quot;&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;link rel=&quot;stylesheet&quot; href=&quot;../js/resources/js-test-style.css&quot;&gt;
+&lt;script src=&quot;../js/resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;p id=&quot;description&quot;&gt;&lt;/p&gt;
+&lt;div id=&quot;console&quot;&gt;&lt;/div&gt;
+&lt;script src=&quot;canvas-stroke-empty-fill.js&quot;&gt;&lt;/script&gt;
+&lt;script src=&quot;../js/resources/js-test-post.js&quot;&gt;&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasstrokeemptyfilljs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-stroke-empty-fill.js (0 => 38364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-stroke-empty-fill.js                                (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-stroke-empty-fill.js        2008-11-13 07:17:53 UTC (rev 38364)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+description(&quot;Series of tests to ensure correct behaviour for stroke() on an empty fillStyle() (alpha=0)&quot;);
+var ctx = document.createElement('canvas').getContext('2d');
+
+ctx.fillStyle = 'rgba(0,0,0,0)';
+ctx.strokeStyle = 'green';
+ctx.lineWidth = 200;
+ctx.moveTo(0,100);
+ctx.lineTo(200,100);
+ctx.stroke();
+var imageData = ctx.getImageData(0, 0, 100, 100);
+var imgdata = imageData.data;
+shouldBe(&quot;imgdata[4]&quot;, &quot;0&quot;);
+shouldBe(&quot;imgdata[5]&quot;, &quot;128&quot;);
+shouldBe(&quot;imgdata[6]&quot;, &quot;0&quot;);
+
+var successfullyParsed = true;
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (38363 => 38364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-11-13 07:17:17 UTC (rev 38363)
+++ trunk/WebCore/ChangeLog        2008-11-13 07:17:53 UTC (rev 38364)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2008-11-12  Dirk Schulze  &lt;vbs85@gmx.de&gt;
+
+        Reviewed Darin Adler.
+
+        use strokeColor.alpha() instead of fillColor.alpha()
+        on GraphicsContext::strokePath()
+
+        [Canvas] Transparent fillStyle stops line rendering
+        https://bugs.webkit.org/show_bug.cgi?id=21888
+
+        Test: fast/canvas/canvas-stroke-empty-fill.html
+
+        * ChangeLog:
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::GraphicsContext::strokePath):
+
</ins><span class="cx"> 2008-11-12  Stephanie  &lt;slewis@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Mark Rowe.
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (38363 => 38364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/cg/GraphicsContextCG.cpp        2008-11-13 07:17:17 UTC (rev 38363)
+++ trunk/WebCore/platform/graphics/cg/GraphicsContextCG.cpp        2008-11-13 07:17:53 UTC (rev 38364)
</span><span class="lines">@@ -512,7 +512,7 @@
</span><span class="cx">     CGContextRef context = platformContext();
</span><span class="cx">     switch (m_common-&gt;state.strokeColorSpace) {
</span><span class="cx">     case SolidColorSpace:
</span><del>-        if (fillColor().alpha())
</del><ins>+        if (strokeColor().alpha())
</ins><span class="cx">             CGContextStrokePath(context);
</span><span class="cx">         break;
</span><span class="cx">     case PatternColorSpace:
</span></span></pre>
</div>
</div>

</body>
</html>