<!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>[172119] 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/172119">172119</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-05 19:19:40 -0700 (Tue, 05 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CG] strokeRect does not honor lineJoin
https://bugs.webkit.org/show_bug.cgi?id=132948
Patch by Nikos Andronikos <nikos.andronikos-webkit@cisra.canon.com.au> on 2014-08-05
Reviewed by Darin Adler.
Source/WebCore:
Replaced use of CGContextStrokeRectWithWidth convenience function with explicit
call to CGContextAddRect and CGContextStrokePath. The convenience functions
CGContextStrokeRect and CGContextStrokeRectWithWidth fail to apply some attributes
(e.g. stroke join) of the graphics state in certain cases.
Test: fast/canvas/canvas-strokeRect-lineJoin.html
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::strokeRect):
LayoutTests:
Test behavior of canvas with stroke rect with line join
* fast/canvas/canvas-strokeRect-lineJoin-expected.txt: Added.
* fast/canvas/canvas-strokeRect-lineJoin.html: Added.
* fast/canvas/script-tests/canvas-strokeRect-lineJoin.js: Added.
* platform/mac-mountainlion/canvas/philip/tests/2d.strokeRect.zero.5-expected.txt: Added.
* platform/mac/fast/canvas/canvas-strokeRect-alpha-shadow-expected.txt: Removed.</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="#trunkLayoutTestsfastcanvascanvasstrokeRectlineJoinexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-strokeRect-lineJoin-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvasstrokeRectlineJoinhtml">trunk/LayoutTests/fast/canvas/canvas-strokeRect-lineJoin.html</a></li>
<li><a href="#trunkLayoutTestsfastcanvasscripttestscanvasstrokeRectlineJoinjs">trunk/LayoutTests/fast/canvas/script-tests/canvas-strokeRect-lineJoin.js</a></li>
<li><a href="#trunkLayoutTestsplatformmacmountainlioncanvasphiliptests2dstrokeRectzero5expectedtxt">trunk/LayoutTests/platform/mac-mountainlion/canvas/philip/tests/2d.strokeRect.zero.5-expected.txt</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacfastcanvascanvasstrokeRectalphashadowexpectedtxt">trunk/LayoutTests/platform/mac/fast/canvas/canvas-strokeRect-alpha-shadow-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172118 => 172119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-08-06 01:39:58 UTC (rev 172118)
+++ trunk/LayoutTests/ChangeLog 2014-08-06 02:19:40 UTC (rev 172119)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-08-05 Nikos Andronikos <nikos.andronikos-webkit@cisra.canon.com.au>
+
+ [CG] strokeRect does not honor lineJoin
+ https://bugs.webkit.org/show_bug.cgi?id=132948
+
+ Reviewed by Darin Adler.
+
+ Test behavior of canvas with stroke rect with line join
+
+ * fast/canvas/canvas-strokeRect-lineJoin-expected.txt: Added.
+ * fast/canvas/canvas-strokeRect-lineJoin.html: Added.
+ * fast/canvas/script-tests/canvas-strokeRect-lineJoin.js: Added.
+ * platform/mac-mountainlion/canvas/philip/tests/2d.strokeRect.zero.5-expected.txt: Added.
+ * platform/mac/fast/canvas/canvas-strokeRect-alpha-shadow-expected.txt: Removed.
+
</ins><span class="cx"> 2014-08-05 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [CSS Shapes] Layout test fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html fails
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasstrokeRectlineJoinexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-strokeRect-lineJoin-expected.txt (0 => 172119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-strokeRect-lineJoin-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-strokeRect-lineJoin-expected.txt 2014-08-06 02:19:40 UTC (rev 172119)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+Ensure correct behavior of canvas with stroke rect with line join
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS data[0] is 0
+PASS data[0] is 0
+PASS data[0] is 0
+PASS data[0] is 0
+PASS data[0] is 255
+PASS data[0] is 0
+PASS data[0] is 0
+PASS data[0] is 255
+PASS data[0] is 255
+PASS data[0] is 255
+PASS data[0] is 0
+PASS data[0] is 255
+PASS data[0] is 0
+PASS data[0] is 255
+PASS data[0] is 255
+PASS data[0] is not 255
+PASS data[0] is not 255
+PASS data[0] is 0
+PASS data[0] is 255
+PASS data[0] is 0
+PASS data[0] is 255
+PASS data[0] is 0
+PASS data[0] is 0
+PASS data[0] is 0
+PASS data[0] is 0
+PASS data[0] is 255
+PASS data[0] is 0
+PASS data[0] is 0
+PASS data[0] is 255
+PASS data[0] is 255
+PASS data[0] is 255
+PASS data[0] is 0
+PASS data[0] is 255
+PASS data[0] is 0
+PASS data[0] is 255
+PASS data[0] is 255
+PASS data[0] is not 255
+PASS data[0] is not 255
+PASS data[0] is 0
+PASS data[0] is 255
+PASS data[0] is 0
+PASS data[0] is 255
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasstrokeRectlineJoinhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-strokeRect-lineJoin.html (0 => 172119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-strokeRect-lineJoin.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-strokeRect-lineJoin.html 2014-08-06 02:19:40 UTC (rev 172119)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/canvas-strokeRect-lineJoin.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvasscripttestscanvasstrokeRectlineJoinjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/script-tests/canvas-strokeRect-lineJoin.js (0 => 172119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/script-tests/canvas-strokeRect-lineJoin.js (rev 0)
+++ trunk/LayoutTests/fast/canvas/script-tests/canvas-strokeRect-lineJoin.js 2014-08-06 02:19:40 UTC (rev 172119)
</span><span class="lines">@@ -0,0 +1,224 @@
</span><ins>+description("Ensure correct behavior of canvas with stroke rect with line join");
+
+var canvas = document.createElement('canvas');
+document.body.appendChild(canvas);
+canvas.setAttribute('width', '600');
+canvas.setAttribute('height', '400');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle="rgba(255, 255, 255, 1.0)";
+ctx.fillRect(0, 0, canvas.width, canvas.height);
+
+ctx.strokeStyle="rgba(0, 0, 0, 1.0)";
+
+ctx.lineWidth = 20;
+
+ctx.save();
+
+ctx.lineJoin = "miter";
+ctx.translate(20, 20);
+ctx.strokeRect(0, 0, 100, 100);
+
+ctx.lineJoin = "bevel";
+ctx.translate(200, 0);
+ctx.strokeRect(0, 0, 100, 100);
+
+ctx.lineJoin = "round";
+ctx.translate(200, 0);
+ctx.strokeRect(0, 0, 100, 100);
+
+ctx.restore();
+
+ctx.translate(0, 200);
+
+ctx.scale(20, 20);
+
+ctx.lineWidth = 1.0;
+
+ctx.lineJoin = "miter";
+ctx.translate(1, 1);
+ctx.strokeRect(0, 0, 5, 5);
+
+ctx.lineJoin = "bevel";
+ctx.translate(10, 0);
+ctx.strokeRect(0, 0, 5, 5);
+
+ctx.lineJoin = "round";
+ctx.translate(10, 0);
+ctx.strokeRect(0, 0, 5, 5);
+
+var imageData, data;
+
+// Verify Join : miter.
+imageData = ctx.getImageData(10, 10, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+imageData = ctx.getImageData(10, 17, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+imageData = ctx.getImageData(17, 10, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+imageData = ctx.getImageData(20, 20, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+imageData = ctx.getImageData(30, 30, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+
+imageData = ctx.getImageData(110, 110, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+imageData = ctx.getImageData(129, 129, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+// Verify Join : bevel.
+imageData = ctx.getImageData(210, 10, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+
+imageData = ctx.getImageData(210, 17, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+
+imageData = ctx.getImageData(217, 10, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+
+imageData = ctx.getImageData(220, 20, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+imageData = ctx.getImageData(230, 30, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+
+imageData = ctx.getImageData(310, 110, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+imageData = ctx.getImageData(329, 129, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+
+// Verify Join : round.
+imageData = ctx.getImageData(410, 10, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+
+imageData = ctx.getImageData(410, 17, 1, 1);
+data = imageData.data;
+shouldNotBe('data[0]', '255');
+
+imageData = ctx.getImageData(417, 10, 1, 1);
+data = imageData.data;
+shouldNotBe('data[0]', '255');
+
+imageData = ctx.getImageData(420, 20, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+imageData = ctx.getImageData(430, 30, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+
+imageData = ctx.getImageData(510, 110, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+imageData = ctx.getImageData(529, 129, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+
+// Verify Join : miter using scaling.
+imageData = ctx.getImageData(10, 210, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+imageData = ctx.getImageData(10, 217, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+imageData = ctx.getImageData(17, 210, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+imageData = ctx.getImageData(20, 220, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+imageData = ctx.getImageData(30, 230, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+
+imageData = ctx.getImageData(110, 310, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+imageData = ctx.getImageData(129, 329, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+// Verify Join : bevel using scaling.
+imageData = ctx.getImageData(210, 210, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+
+imageData = ctx.getImageData(210, 217, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+
+imageData = ctx.getImageData(217, 210, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+
+imageData = ctx.getImageData(220, 220, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+imageData = ctx.getImageData(230, 230, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+
+imageData = ctx.getImageData(310, 310, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+imageData = ctx.getImageData(329, 329, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+
+// Verify Join : round using scaling.
+imageData = ctx.getImageData(410, 210, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+
+imageData = ctx.getImageData(410, 217, 1, 1);
+data = imageData.data;
+shouldNotBe('data[0]', '255');
+
+imageData = ctx.getImageData(417, 210, 1, 1);
+data = imageData.data;
+shouldNotBe('data[0]', '255');
+
+imageData = ctx.getImageData(420, 220, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+imageData = ctx.getImageData(430, 230, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+
+imageData = ctx.getImageData(510, 310, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '0');
+
+imageData = ctx.getImageData(529, 329, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcanvascanvasstrokeRectalphashadowexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac/fast/canvas/canvas-strokeRect-alpha-shadow-expected.txt (172118 => 172119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/canvas/canvas-strokeRect-alpha-shadow-expected.txt 2014-08-06 01:39:58 UTC (rev 172118)
+++ trunk/LayoutTests/platform/mac/fast/canvas/canvas-strokeRect-alpha-shadow-expected.txt 2014-08-06 02:19:40 UTC (rev 172119)
</span><span class="lines">@@ -1,213 +0,0 @@
</span><del>-Ensure correct behavior of canvas with strokeRect using a semi-transparent solid strokeStyle and a shadow
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Verifying alpha shadow...
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-PASS data[0] is 255
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is around 64
-PASS data[0] is 255
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is around 64
-PASS data[0] is 255
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is around 64
-PASS data[0] is 255
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is around 64
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-FAIL data[0] should be 0. Was 255.
-PASS data[1] is 0
-PASS data[2] is 0
-FAIL data[3] should be 0. Was 1.
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-
-Verifying blurry shadow...
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-FAIL data[0] should be 0. Was 255.
-PASS data[1] is 0
-PASS data[2] is 0
-FAIL data[3] should be 0. Was 1.
-FAIL data[0] should be 0. Was 255.
-PASS data[1] is 0
-PASS data[2] is 0
-FAIL data[3] should be 0. Was 1.
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-PASS data[0] is 255
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is around 64
-PASS data[0] is 255
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is around 64
-PASS data[0] is 255
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is around 64
-PASS data[0] is 255
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is around 64
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-FAIL data[0] should be 0. Was 255.
-PASS data[1] is 0
-PASS data[2] is 0
-FAIL data[3] should be 0. Was 1.
-
-Verifying rotated alpha shadow...
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-PASS data[0] is 255
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is around 64
-PASS data[0] is 255
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is around 64
-PASS data[0] is 255
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is around 64
-PASS data[0] is 255
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is around 64
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-FAIL data[0] should be 0. Was 255.
-PASS data[1] is 0
-PASS data[2] is 0
-FAIL data[3] should be 0. Was 1.
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-
-Verifying rotated blurry shadow...
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-FAIL data[0] should be 0. Was 255.
-PASS data[1] is 0
-PASS data[2] is 0
-FAIL data[3] should be 0. Was 1.
-FAIL data[0] should be 0. Was 255.
-PASS data[1] is 0
-PASS data[2] is 0
-FAIL data[3] should be 0. Was 1.
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-PASS data[0] is 255
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is around 64
-PASS data[0] is 255
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is around 64
-PASS data[0] is 255
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is around 64
-PASS data[0] is 255
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is around 64
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-FAIL data[0] should be 0. Was 255.
-PASS data[1] is 0
-PASS data[2] is 0
-FAIL data[3] should be 0. Was 1.
-PASS data[0] is 0
-PASS data[1] is 0
-PASS data[2] is 0
-PASS data[3] is 0
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacmountainlioncanvasphiliptests2dstrokeRectzero5expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-mountainlion/canvas/philip/tests/2d.strokeRect.zero.5-expected.txt (0 => 172119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mountainlion/canvas/philip/tests/2d.strokeRect.zero.5-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-mountainlion/canvas/philip/tests/2d.strokeRect.zero.5-expected.txt 2014-08-06 02:19:40 UTC (rev 172119)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Failed assertion: got pixel [0,0,0,0] at (50,25), expected [0,255,0,255]
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172118 => 172119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-06 01:39:58 UTC (rev 172118)
+++ trunk/Source/WebCore/ChangeLog 2014-08-06 02:19:40 UTC (rev 172119)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-08-05 Nikos Andronikos <nikos.andronikos-webkit@cisra.canon.com.au>
+
+ [CG] strokeRect does not honor lineJoin
+ https://bugs.webkit.org/show_bug.cgi?id=132948
+
+ Reviewed by Darin Adler.
+
+ Replaced use of CGContextStrokeRectWithWidth convenience function with explicit
+ call to CGContextAddRect and CGContextStrokePath. The convenience functions
+ CGContextStrokeRect and CGContextStrokeRectWithWidth fail to apply some attributes
+ (e.g. stroke join) of the graphics state in certain cases.
+
+ Test: fast/canvas/canvas-strokeRect-lineJoin.html
+
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::GraphicsContext::strokeRect):
+
</ins><span class="cx"> 2014-08-05 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Build attempts to use ANGLE when not building WebGL.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (172118 => 172119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-08-06 01:39:58 UTC (rev 172118)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-08-06 02:19:40 UTC (rev 172119)
</span><span class="lines">@@ -1161,7 +1161,19 @@
</span><span class="cx">
</span><span class="cx"> if (m_state.strokePattern)
</span><span class="cx"> applyStrokePattern();
</span><del>- CGContextStrokeRectWithWidth(context, rect, lineWidth);
</del><ins>+
+ // Using CGContextAddRect and CGContextStrokePath to stroke rect rather than
+ // convenience functions (CGContextStrokeRect/CGContextStrokeRectWithWidth).
+ // The convenience functions currently (in at least OSX 10.9.4) fail to
+ // apply some attributes of the graphics state in certain cases
+ // (as identified in https://bugs.webkit.org/show_bug.cgi?id=132948)
+ CGContextSaveGState(context);
+ setStrokeThickness(lineWidth);
+
+ CGContextAddRect(context, rect);
+ CGContextStrokePath(context);
+
+ CGContextRestoreGState(context);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::setLineCap(LineCap cap)
</span></span></pre>
</div>
</div>
</body>
</html>