<!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>[165651] 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/165651">165651</a></dd>
<dt>Author</dt> <dd>krit@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-14 14:43:26 -0700 (Fri, 14 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor Path to Path2D and remove currentPath
https://bugs.webkit.org/show_bug.cgi?id=130236
Reviewed by Dean Jackson.
Source/WebCore:
Other implementations prefer Path2D over Path. Furthermore, currentPath is not the right
way to apply a Path2D object to a context. Main argument is that currentPath creates a copy
of the Path2D object. Instead we pass Path2D as argument to fill, stroke and clip now.
Tests: fast/canvas/canvas-clip-path.html
fast/canvas/canvas-fill-path.html
fast/canvas/canvas-stroke-path.html
* bindings/scripts/CodeGeneratorJS.pm: WebIDL parser didn't handle enumerations
for overloaded methods at all.
(GenerateParametersCheckExpression):
* html/canvas/CanvasRenderingContext2D.cpp: New functions with DOMPath argument.
(WebCore::CanvasRenderingContext2D::fill):
(WebCore::CanvasRenderingContext2D::stroke):
(WebCore::CanvasRenderingContext2D::clip):
(WebCore::CanvasRenderingContext2D::fillInternal): Internal method to avoid code duplication
and copy operation.
(WebCore::CanvasRenderingContext2D::strokeInternal): Ditto.
(WebCore::CanvasRenderingContext2D::clipInternal): Ditto.
* html/canvas/CanvasRenderingContext2D.h:
* html/canvas/CanvasRenderingContext2D.idl:
* html/canvas/DOMPath.idl: Rename Path to Path2D.
LayoutTests:
Add new tests for Path2D object and new functions fill(),
stroke() and clip() with Path2D argument.
* fast/canvas/canvas-clip-path-expected.txt: Added.
* fast/canvas/canvas-clip-path.html: Added.
* fast/canvas/canvas-currentPath-crash-expected.txt: Removed.
* fast/canvas/canvas-currentPath-crash.html: Removed.
* fast/canvas/canvas-currentPath-expected.txt: Removed.
* fast/canvas/canvas-currentPath.html: Removed.
* fast/canvas/canvas-fill-path-expected.txt: Added.
* fast/canvas/canvas-fill-path.html: Added.
* fast/canvas/canvas-path-constructors-expected.txt:
* fast/canvas/canvas-path-object-expected.txt:
* fast/canvas/canvas-stroke-path-expected.txt: Added.
* fast/canvas/canvas-stroke-path.html: Added.
* fast/canvas/script-tests/canvas-clip-path.js: Added.
(areaColor):
* fast/canvas/script-tests/canvas-currentPath-crash.js: Removed.
* fast/canvas/script-tests/canvas-currentPath.js: Removed.
* fast/canvas/script-tests/canvas-fill-path.js: Added.
(areaColor):
* fast/canvas/script-tests/canvas-path-constructors.js:
* fast/canvas/script-tests/canvas-path-object.js:
* fast/canvas/script-tests/canvas-stroke-path.js: Added.
(areaColor):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvaspathconstructorsexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-path-constructors-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvaspathobjectexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-path-object-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvasscripttestscanvaspathconstructorsjs">trunk/LayoutTests/fast/canvas/script-tests/canvas-path-constructors.js</a></li>
<li><a href="#trunkLayoutTestsfastcanvasscripttestscanvaspathobjectjs">trunk/LayoutTests/fast/canvas/script-tests/canvas-path-object.js</a></li>
<li><a href="#trunkLayoutTestsjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmountainlionjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Didl">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasDOMPathidl">trunk/Source/WebCore/html/canvas/DOMPath.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcanvascanvasclippathexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-clip-path-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvasclippathhtml">trunk/LayoutTests/fast/canvas/canvas-clip-path.html</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvasfillpathexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-fill-path-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvasfillpathhtml">trunk/LayoutTests/fast/canvas/canvas-fill-path.html</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvasstrokepathexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-stroke-path-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvasstrokepathhtml">trunk/LayoutTests/fast/canvas/canvas-stroke-path.html</a></li>
<li><a href="#trunkLayoutTestsfastcanvasscripttestscanvasclippathjs">trunk/LayoutTests/fast/canvas/script-tests/canvas-clip-path.js</a></li>
<li><a href="#trunkLayoutTestsfastcanvasscripttestscanvasfillpathjs">trunk/LayoutTests/fast/canvas/script-tests/canvas-fill-path.js</a></li>
<li><a href="#trunkLayoutTestsfastcanvasscripttestscanvasstrokepathjs">trunk/LayoutTests/fast/canvas/script-tests/canvas-stroke-path.js</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcanvascanvascurrentPathcrashexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-currentPath-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvascurrentPathcrashhtml">trunk/LayoutTests/fast/canvas/canvas-currentPath-crash.html</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvascurrentPathexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-currentPath-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvascurrentPathhtml">trunk/LayoutTests/fast/canvas/canvas-currentPath.html</a></li>
<li><a href="#trunkLayoutTestsfastcanvasscripttestscanvascurrentPathcrashjs">trunk/LayoutTests/fast/canvas/script-tests/canvas-currentPath-crash.js</a></li>
<li><a href="#trunkLayoutTestsfastcanvasscripttestscanvascurrentPathjs">trunk/LayoutTests/fast/canvas/script-tests/canvas-currentPath.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/LayoutTests/ChangeLog 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-03-14 Dirk Schulze <krit@webkit.org>
+
+ Refactor Path to Path2D and remove currentPath
+ https://bugs.webkit.org/show_bug.cgi?id=130236
+
+ Reviewed by Dean Jackson.
+
+ Add new tests for Path2D object and new functions fill(),
+ stroke() and clip() with Path2D argument.
+
+ * fast/canvas/canvas-clip-path-expected.txt: Added.
+ * fast/canvas/canvas-clip-path.html: Added.
+ * fast/canvas/canvas-currentPath-crash-expected.txt: Removed.
+ * fast/canvas/canvas-currentPath-crash.html: Removed.
+ * fast/canvas/canvas-currentPath-expected.txt: Removed.
+ * fast/canvas/canvas-currentPath.html: Removed.
+ * fast/canvas/canvas-fill-path-expected.txt: Added.
+ * fast/canvas/canvas-fill-path.html: Added.
+ * fast/canvas/canvas-path-constructors-expected.txt:
+ * fast/canvas/canvas-path-object-expected.txt:
+ * fast/canvas/canvas-stroke-path-expected.txt: Added.
+ * fast/canvas/canvas-stroke-path.html: Added.
+ * fast/canvas/script-tests/canvas-clip-path.js: Added.
+ (areaColor):
+ * fast/canvas/script-tests/canvas-currentPath-crash.js: Removed.
+ * fast/canvas/script-tests/canvas-currentPath.js: Removed.
+ * fast/canvas/script-tests/canvas-fill-path.js: Added.
+ (areaColor):
+ * fast/canvas/script-tests/canvas-path-constructors.js:
+ * fast/canvas/script-tests/canvas-path-object.js:
+ * fast/canvas/script-tests/canvas-stroke-path.js: Added.
+ (areaColor):
+
</ins><span class="cx"> 2014-03-14 James Craig <jcraig@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: AXI: Suppress axParentNodeId entirely in getAccessibilityPropertiesForNode.html b/c the int value isn't consistent enough for a layout test.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasclippathexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-clip-path-expected.txt (0 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-clip-path-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-clip-path-expected.txt 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+Test Path2D as argument for clip.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Simple test of Path2D as argumeny for clip().
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:0,b:0,a:0}) is true
+
+Transform context and apply clip(). Context path should be ignored.
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:0,b:0,a:0}) is true
+
+Path2D should not affect context path.
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:0,b:0,a:0}) is true
+PASS areaColor(imageData.data, {r:0,g:0,b:0,a:0}) is true
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+
+Test WindingRule for Path2D.
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:0,b:0,a:0}) is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasclippathhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-clip-path.html (0 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-clip-path.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-clip-path.html 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<canvas id="canvas" width="200" height="200"></canvas>
+<script src="script-tests/canvas-clip-path.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvascurrentPathcrashexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/canvas/canvas-currentPath-crash-expected.txt (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-currentPath-crash-expected.txt 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/LayoutTests/fast/canvas/canvas-currentPath-crash-expected.txt 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-Series of tests to ensure that currentPath does not take non-Path values.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS imgdata[0] is 0
-PASS imgdata[1] is 128
-PASS imgdata[2] is 0
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvascurrentPathcrashhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/canvas/canvas-currentPath-crash.html (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-currentPath-crash.html 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/LayoutTests/fast/canvas/canvas-currentPath-crash.html 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-<!doctype html>
-<html>
-<head>
-<script src="../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script src="script-tests/canvas-currentPath-crash.js"></script>
-<script src="../../resources/js-test-post.js"></script>
-</body>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvascurrentPathexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/canvas/canvas-currentPath-expected.txt (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-currentPath-expected.txt 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/LayoutTests/fast/canvas/canvas-currentPath-expected.txt 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -1,84 +0,0 @@
</span><del>-Test the behavior of currentPath in Canvas
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Create path object, replace current context path with the path of this object.
-PASS ctx.isPointInPath(49,49) is false
-PASS ctx.isPointInPath(99,99) is false
-PASS ctx.isPointInPath(149,149) is false
-PASS ctx.isPointInPath(199,199) is false
-PASS ctx.isPointInPath(249,249) is false
-PASS ctx.isPointInPath(49,49) is true
-PASS ctx.isPointInPath(99,99) is true
-PASS ctx.isPointInPath(149,149) is true
-PASS ctx.isPointInPath(199,199) is true
-PASS ctx.isPointInPath(249,249) is false
-
-Add new segment to context path and check that this is not added to the path object (not live).
-PASS ctx.isPointInPath(49,49) is true
-PASS ctx.isPointInPath(99,99) is true
-PASS ctx.isPointInPath(149,149) is true
-PASS ctx.isPointInPath(199,199) is true
-PASS ctx.isPointInPath(249,249) is true
-PASS ctx.isPointInPath(49,49) is true
-PASS ctx.isPointInPath(99,99) is true
-PASS ctx.isPointInPath(149,149) is true
-PASS ctx.isPointInPath(199,199) is true
-PASS ctx.isPointInPath(249,249) is false
-
-Test that path object can get applied to transformed context, respecting the CTM.
-PASS ctx.isPointInPath(49,49) is false
-PASS ctx.isPointInPath(99,99) is false
-PASS ctx.isPointInPath(149,149) is true
-PASS ctx.isPointInPath(199,199) is true
-PASS ctx.isPointInPath(249,249) is true
-
-Test that currentPath returns a path object.
-PASS p is null
-PASS p is an instance of Path
-
-Create context path and test that it exists.
-PASS ctx.isPointInPath(49,49) is true
-PASS ctx.isPointInPath(99,99) is true
-PASS ctx.isPointInPath(149,149) is true
-PASS ctx.isPointInPath(199,199) is true
-PASS ctx.isPointInPath(249,249) is false
-
-Clear context path.
-PASS ctx.isPointInPath(49,49) is false
-PASS ctx.isPointInPath(99,99) is false
-PASS ctx.isPointInPath(149,149) is false
-PASS ctx.isPointInPath(199,199) is false
-PASS ctx.isPointInPath(249,249) is false
-
-Apply stored (non-live) path object back to context.
-PASS ctx.isPointInPath(49,49) is true
-PASS ctx.isPointInPath(99,99) is true
-PASS ctx.isPointInPath(149,149) is true
-PASS ctx.isPointInPath(199,199) is true
-PASS ctx.isPointInPath(249,249) is false
-
-Transform CTM in the process of adding segments to context path. Check that currentPath's path object archive these transformations.
-PASS ctx.isPointInPath(49,49) is true
-PASS ctx.isPointInPath(99,99) is true
-PASS ctx.isPointInPath(149,149) is false
-PASS ctx.isPointInPath(199,199) is true
-PASS ctx.isPointInPath(249,249) is true
-Clear current path on object and check that it is cleaned up.
-PASS ctx.isPointInPath(49,49) is false
-PASS ctx.isPointInPath(99,99) is false
-PASS ctx.isPointInPath(149,149) is false
-PASS ctx.isPointInPath(199,199) is false
-PASS ctx.isPointInPath(249,249) is false
-
-Apply path back to context path.
-PASS ctx.isPointInPath(49,49) is true
-PASS ctx.isPointInPath(99,99) is true
-PASS ctx.isPointInPath(149,149) is false
-PASS ctx.isPointInPath(199,199) is true
-PASS ctx.isPointInPath(249,249) is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvascurrentPathhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/canvas/canvas-currentPath.html (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-currentPath.html 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/LayoutTests/fast/canvas/canvas-currentPath.html 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-<!doctype html>
-<html>
-<head>
-<script src="../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script src="script-tests/canvas-currentPath.js"></script>
-<script src="../../resources/js-test-post.js"></script>
-</body>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasfillpathexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-fill-path-expected.txt (0 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-fill-path-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-fill-path-expected.txt 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+Test Path2D as argument for fill.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Simple test of Path2D as argumeny for fill().
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+
+Transform context and apply fill(). Context path should be ignored.
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:0,b:0,a:0}) is true
+
+Path2D should not affect context path.
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:0,b:0,a:0}) is true
+PASS areaColor(imageData.data, {r:0,g:0,b:0,a:0}) is true
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+
+Test WindingRule for Path2D.
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:0,b:0,a:0}) is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasfillpathhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-fill-path.html (0 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-fill-path.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-fill-path.html 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<canvas id="canvas" width="200" height="200"></canvas>
+<script src="script-tests/canvas-fill-path.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvaspathconstructorsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/canvas-path-constructors-expected.txt (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-path-constructors-expected.txt 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/LayoutTests/fast/canvas/canvas-path-constructors-expected.txt 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -3,19 +3,19 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-Test constructor Path().
</del><ins>+Test constructor Path2D().
</ins><span class="cx"> PASS imgdata[4] is 255
</span><span class="cx"> PASS imgdata[5] is 255
</span><span class="cx"> PASS imgdata[6] is 0
</span><span class="cx"> PASS imgdata[7] is 255
</span><span class="cx">
</span><del>-Test constructor Path(DOMString) which takes a SVG data string.
</del><ins>+Test constructor Path2D(DOMString) which takes a SVG data string.
</ins><span class="cx"> PASS imgdata[4] is 0
</span><span class="cx"> PASS imgdata[5] is 0
</span><span class="cx"> PASS imgdata[6] is 255
</span><span class="cx"> PASS imgdata[7] is 255
</span><span class="cx">
</span><del>-Test constructor Path(Path) which takes another Path object.
</del><ins>+Test constructor Path2D(Path2D) which takes another Path2D object.
</ins><span class="cx"> PASS imgdata[4] is 0
</span><span class="cx"> PASS imgdata[5] is 128
</span><span class="cx"> PASS imgdata[6] is 0
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvaspathobjectexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/canvas-path-object-expected.txt (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-path-object-expected.txt 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/LayoutTests/fast/canvas/canvas-path-object-expected.txt 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS typeof document.getElementById is "function"
</span><del>-PASS path is an instance of Path
</del><ins>+PASS path is an instance of Path2D
</ins><span class="cx"> PASS typeof path.closePath is "function"
</span><span class="cx"> PASS typeof path.moveTo is "function"
</span><span class="cx"> PASS typeof path.lineTo is "function"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasstrokepathexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-stroke-path-expected.txt (0 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-stroke-path-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-stroke-path-expected.txt 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+Test Path2D as argument for stroke.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Simple test of Path2D as argumeny for stroke().
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+
+Transform context and apply stroke(). Context path should be ignored.
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+
+Path2D should not affect context path.
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasstrokepathhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-stroke-path.html (0 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-stroke-path.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-stroke-path.html 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<canvas id="canvas" width="200" height="200"></canvas>
+<script src="script-tests/canvas-stroke-path.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvasscripttestscanvasclippathjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/script-tests/canvas-clip-path.js (0 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/script-tests/canvas-clip-path.js (rev 0)
+++ trunk/LayoutTests/fast/canvas/script-tests/canvas-clip-path.js 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -0,0 +1,110 @@
</span><ins>+description('Test Path2D as argument for clip.');
+
+function areaColor(data, refColor) {
+ if (!data.length)
+ return true;
+ var c = {r:0,g:0,b:0,a:0};
+ for (var i = 0; i < data.length; i += 4) {
+ c.r += data[i];
+ c.g += data[i+1];
+ c.b += data[i+2];
+ c.a += data[i+3];
+ }
+ if (refColor.r == Math.round(c.r/data.length*4)
+ && refColor.g == Math.round(c.g/data.length*4)
+ && refColor.b == Math.round(c.b/data.length*4)
+ && refColor.a == Math.round(c.a/data.length*4))
+ return true;
+ return false;
+}
+
+var ctx = document.createElement('canvas').getContext('2d');
+document.body.appendChild(ctx.canvas);
+
+var path = new Path2D();
+path.moveTo(0,0);
+path.lineTo(100,0);
+path.lineTo(100,100);
+path.lineTo(0,100);
+path.lineTo(0,20);
+path.lineTo(80,20);
+path.lineTo(80,80);
+path.lineTo(20,80);
+path.lineTo(20,20);
+path.lineTo(0,20);
+path.closePath();
+
+debug('Simple test of Path2D as argumeny for clip().');
+ctx.fillStyle = 'rgb(0,255,0)';
+ctx.save();
+ctx.clip(path);
+ctx.fillRect(0,0,300,150);
+ctx.restore();
+var imageData = ctx.getImageData(0, 0, 100, 100);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+imageData = ctx.getImageData(100, 100, 50, 50);
+shouldBe('areaColor(imageData.data, {r:0,g:0,b:0,a:0})', 'true');
+debug('');
+
+ctx.clearRect(0,0,300,150);
+debug('Transform context and apply clip(). Context path should be ignored.');
+ctx.save();
+ctx.scale(2,2);
+ctx.translate(50,50);
+ctx.beginPath();
+ctx.rect(-100,-100,100,100); // Ignore this path.
+ctx.clip(path);
+ctx.fillRect(0,0,300,150);
+ctx.restore();
+imageData = ctx.getImageData(100, 100, 200, 50);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+imageData = ctx.getImageData(0, 0, 100, 100);
+shouldBe('areaColor(imageData.data, {r:0,g:0,b:0,a:0})', 'true');
+debug('');
+
+ctx.clearRect(0,0,300,150);
+debug('Path2D should not affect context path.');
+ctx.save();
+ctx.beginPath();
+ctx.rect(100,100,50,50);
+ctx.clip(path);
+ctx.fillRect(0,0,300,150);
+ctx.restore();
+imageData = ctx.getImageData(0, 0, 100, 100);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+imageData = ctx.getImageData(100, 100, 50, 50);
+shouldBe('areaColor(imageData.data, {r:0,g:0,b:0,a:0})', 'true');
+ctx.clearRect(0,0,300,150);
+ctx.save();
+ctx.clip();
+ctx.fillRect(0,0,300,150);
+ctx.restore();
+imageData = ctx.getImageData(0, 0, 100, 100);
+shouldBe('areaColor(imageData.data, {r:0,g:0,b:0,a:0})', 'true');
+imageData = ctx.getImageData(100, 100, 50, 50);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+debug('');
+
+ctx.clearRect(0,0,300,150);
+debug('Test WindingRule for Path2D.');
+ctx.save();
+ctx.clip(path, 'nonzero');
+ctx.fillRect(0,0,300,150);
+ctx.restore();
+imageData = ctx.getImageData(0, 0, 100, 100);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+ctx.clearRect(0,0,300,150);
+ctx.save();
+ctx.clip(path, 'evenodd');
+ctx.fillRect(0,0,300,150);
+ctx.restore();
+imageData = ctx.getImageData(0, 0, 100, 20);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+imageData = ctx.getImageData(0, 80, 100, 20);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+imageData = ctx.getImageData(0, 20, 20, 60);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+imageData = ctx.getImageData(80, 20, 20, 60);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+imageData = ctx.getImageData(20, 20, 60, 60);
+shouldBe('areaColor(imageData.data, {r:0,g:0,b:0,a:0})', 'true');
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvasscripttestscanvascurrentPathcrashjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/canvas/script-tests/canvas-currentPath-crash.js (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/script-tests/canvas-currentPath-crash.js 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/LayoutTests/fast/canvas/script-tests/canvas-currentPath-crash.js 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>-description("Series of tests to ensure that currentPath does not take non-Path values.");
-var ctx = document.createElement('canvas').getContext('2d');
-ctx.fillStyle = "green";
-ctx.beginPath();
-ctx.rect(0,0,100,100);
-
-ctx.currentPath = null;
-ctx.currentPath = 0;
-ctx.currentPath = {};
-ctx.currentPath = new Array();
-ctx.currentPath = undefined;
-
-ctx.fill();
-var imageData = ctx.getImageData(50, 50, 1, 1);
-var imgdata = imageData.data;
-shouldBe("imgdata[0]", "0");
-shouldBe("imgdata[1]", "128");
-shouldBe("imgdata[2]", "0");
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvasscripttestscanvascurrentPathjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/canvas/script-tests/canvas-currentPath.js (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/script-tests/canvas-currentPath.js 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/LayoutTests/fast/canvas/script-tests/canvas-currentPath.js 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -1,96 +0,0 @@
</span><del>-description("Test the behavior of currentPath in Canvas");
-var ctx = document.createElement('canvas').getContext('2d');
-
-var testStrings = [
- "ctx.isPointInPath(49,49)",
- "ctx.isPointInPath(99,99)",
- "ctx.isPointInPath(149,149)",
- "ctx.isPointInPath(199,199)",
- "ctx.isPointInPath(249,249)"
-];
-
-// Test collection of points. Each point has an offset of 50,50 to previous point.
-function testPointCollection(hitResults) {
- for (var i = 0; i < hitResults.length; i++) {
- if (hitResults[i])
- shouldBeTrue(testStrings[i]);
- else
- shouldBeFalse(testStrings[i]);
- }
-}
-
-document.body.appendChild(ctx.canvas);
-
-ctx.fillStyle = '#0f0';
-ctx.beginPath();
-
-debug("Create path object, replace current context path with the path of this object.");
-var p = new Path();
-p.rect(0,0,200,200);
-testPointCollection([false, false, false, false, false]);
-
-ctx.currentPath = p;
-
-testPointCollection([true, true, true, true, false]);
-debug("");
-
-debug("Add new segment to context path and check that this is not added to the path object (not live).")
-
-ctx.rect(50,50,200,200);
-testPointCollection([true, true, true, true, true]);
-
-ctx.currentPath = p;
-
-testPointCollection([true, true, true, true, false]);
-debug("");
-
-debug("Test that path object can get applied to transformed context, respecting the CTM.");
-
-ctx.beginPath();
-ctx.translate(100,100);
-ctx.currentPath = p;
-ctx.translate(-100,-100);
-testPointCollection([false, false, true, true, true]);
-
-debug("");
-
-debug("Test that currentPath returns a path object.");
-p = null;
-shouldBeNull("p");
-ctx.beginPath();
-ctx.rect(0,0,200,200);
-p = ctx.currentPath;
-shouldBeType("p", "Path");
-debug("");
-
-debug("Create context path and test that it exists.");
-testPointCollection([true, true, true, true, false]);
-debug("");
-
-debug("Clear context path.");
-ctx.beginPath();
-testPointCollection([false, false, false, false, false]);
-debug("");
-
-debug("Apply stored (non-live) path object back to context.");
-ctx.currentPath = p;
-testPointCollection([true, true, true, true, false]);
-debug("");
-
-debug("Transform CTM in the process of adding segments to context path. Check that currentPath's path object archive these transformations.");
-ctx.beginPath();
-ctx.rect(0,0,100,100);
-ctx.translate(150,150);
-ctx.rect(0,0,100,100);
-ctx.translate(-150,-150);
-testPointCollection([true, true, false, true, true]);
-p = ctx.currentPath;
-
-debug("Clear current path on object and check that it is cleaned up.");
-ctx.beginPath();
-testPointCollection([false, false, false, false, false]);
-debug("");
-
-debug("Apply path back to context path.")
-ctx.currentPath = p;
-testPointCollection([true, true, false, true, true]);
</del></span></pre></div>
<a id="trunkLayoutTestsfastcanvasscripttestscanvasfillpathjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/script-tests/canvas-fill-path.js (0 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/script-tests/canvas-fill-path.js (rev 0)
+++ trunk/LayoutTests/fast/canvas/script-tests/canvas-fill-path.js 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -0,0 +1,92 @@
</span><ins>+description('Test Path2D as argument for fill.');
+
+function areaColor(data, refColor) {
+ if (!data.length)
+ return true;
+ var c = {r:0,g:0,b:0,a:0};
+ for (var i = 0; i < data.length; i += 4) {
+ c.r += data[i];
+ c.g += data[i+1];
+ c.b += data[i+2];
+ c.a += data[i+3];
+ }
+ if (refColor.r == Math.round(c.r/data.length*4)
+ && refColor.g == Math.round(c.g/data.length*4)
+ && refColor.b == Math.round(c.b/data.length*4)
+ && refColor.a == Math.round(c.a/data.length*4))
+ return true;
+ return false;
+}
+
+var ctx = document.createElement('canvas').getContext('2d');
+document.body.appendChild(ctx.canvas);
+
+var path = new Path2D();
+path.moveTo(0,0);
+path.lineTo(100,0);
+path.lineTo(100,100);
+path.lineTo(0,100);
+path.lineTo(0,20);
+path.lineTo(80,20);
+path.lineTo(80,80);
+path.lineTo(20,80);
+path.lineTo(20,20);
+path.lineTo(0,20);
+path.closePath();
+
+debug('Simple test of Path2D as argumeny for fill().');
+ctx.fillStyle = 'rgb(0,255,0)';
+ctx.fill(path);
+var imageData = ctx.getImageData(0, 0, 100, 100);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+debug('');
+
+ctx.clearRect(0,0,300,150);
+debug('Transform context and apply fill(). Context path should be ignored.');
+ctx.save();
+ctx.scale(2,2);
+ctx.translate(50,50);
+ctx.beginPath();
+ctx.rect(-100,-100,100,100); // Ignore this path.
+ctx.fill(path);
+ctx.restore();
+imageData = ctx.getImageData(100, 100, 200, 50);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+imageData = ctx.getImageData(0, 0, 100, 100);
+shouldBe('areaColor(imageData.data, {r:0,g:0,b:0,a:0})', 'true');
+debug('');
+
+ctx.clearRect(0,0,300,150);
+debug('Path2D should not affect context path.');
+ctx.beginPath();
+ctx.rect(100,100,50,50);
+ctx.fill(path);
+imageData = ctx.getImageData(0, 0, 100, 100);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+imageData = ctx.getImageData(100, 100, 50, 50);
+shouldBe('areaColor(imageData.data, {r:0,g:0,b:0,a:0})', 'true');
+ctx.clearRect(0,0,300,150);
+ctx.fill();
+imageData = ctx.getImageData(0, 0, 100, 100);
+shouldBe('areaColor(imageData.data, {r:0,g:0,b:0,a:0})', 'true');
+imageData = ctx.getImageData(100, 100, 50, 50);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+debug('');
+
+ctx.clearRect(0,0,300,150);
+debug('Test WindingRule for Path2D.');
+ctx.fill(path, 'nonzero');
+imageData = ctx.getImageData(0, 0, 100, 100);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+ctx.clearRect(0,0,300,150);
+ctx.fill(path, 'evenodd');
+imageData = ctx.getImageData(0, 0, 100, 20);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+imageData = ctx.getImageData(0, 80, 100, 20);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+imageData = ctx.getImageData(0, 20, 20, 60);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+imageData = ctx.getImageData(80, 20, 20, 60);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+imageData = ctx.getImageData(20, 20, 60, 60);
+shouldBe('areaColor(imageData.data, {r:0,g:0,b:0,a:0})', 'true');
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvasscripttestscanvaspathconstructorsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/script-tests/canvas-path-constructors.js (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/script-tests/canvas-path-constructors.js 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/LayoutTests/fast/canvas/script-tests/canvas-path-constructors.js 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -1,13 +1,11 @@
</span><span class="cx"> description("Test different constructors of Path.");
</span><span class="cx"> var ctx = document.createElement('canvas').getContext('2d');
</span><span class="cx">
</span><del>-debug("Test constructor Path().")
-ctx.beginPath();
-var p1 = new Path();
</del><ins>+debug("Test constructor Path2D().")
+var p1 = new Path2D();
</ins><span class="cx"> p1.rect(0,0,100,100);
</span><span class="cx"> ctx.fillStyle = 'yellow';
</span><del>-ctx.currentPath = p1;
-ctx.fill();
</del><ins>+ctx.fill(p1);
</ins><span class="cx"> var imageData = ctx.getImageData(0, 0, 100, 100);
</span><span class="cx"> var imgdata = imageData.data;
</span><span class="cx"> shouldBe("imgdata[4]", "255");
</span><span class="lines">@@ -16,12 +14,10 @@
</span><span class="cx"> shouldBe("imgdata[7]", "255");
</span><span class="cx"> debug("");
</span><span class="cx">
</span><del>-debug("Test constructor Path(DOMString) which takes a SVG data string.")
-ctx.beginPath();
-var p2 = new Path("M100,0L200,0L200,100L100,100z");
-ctx.currentPath = p2;
</del><ins>+debug("Test constructor Path2D(DOMString) which takes a SVG data string.")
+var p2 = new Path2D("M100,0L200,0L200,100L100,100z");
</ins><span class="cx"> ctx.fillStyle = 'blue';
</span><del>-ctx.fill();
</del><ins>+ctx.fill(p2);
</ins><span class="cx"> imageData = ctx.getImageData(100, 0, 100, 100);
</span><span class="cx"> imgdata = imageData.data;
</span><span class="cx"> shouldBe("imgdata[4]", "0");
</span><span class="lines">@@ -30,15 +26,11 @@
</span><span class="cx"> shouldBe("imgdata[7]", "255");
</span><span class="cx"> debug("");
</span><span class="cx">
</span><del>-debug("Test constructor Path(Path) which takes another Path object.")
-ctx.beginPath();
-var p3 = new Path(p1);
-ctx.translate(200,0);
-ctx.currentPath = p3;
</del><ins>+debug("Test constructor Path2D(Path2D) which takes another Path2D object.")
+var p3 = new Path2D(p1);
</ins><span class="cx"> ctx.fillStyle = 'green';
</span><del>-ctx.translate(-200,0);
-ctx.fill();
-imageData = ctx.getImageData(200, 0, 100, 100);
</del><ins>+ctx.fill(p3);
+imageData = ctx.getImageData(0, 0, 100, 100);
</ins><span class="cx"> imgdata = imageData.data;
</span><span class="cx"> shouldBe("imgdata[4]", "0");
</span><span class="cx"> shouldBe("imgdata[5]", "128");
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvasscripttestscanvaspathobjectjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/script-tests/canvas-path-object.js (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/script-tests/canvas-path-object.js 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/LayoutTests/fast/canvas/script-tests/canvas-path-object.js 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -2,8 +2,8 @@
</span><span class="cx">
</span><span class="cx"> shouldBe("typeof document.getElementById", '"function"');
</span><span class="cx">
</span><del>-var path = new Path();
-shouldBeType("path", "Path");
</del><ins>+var path = new Path2D();
+shouldBeType("path", "Path2D");
</ins><span class="cx"> shouldBe("typeof path.closePath", '"function"');
</span><span class="cx"> shouldBe("typeof path.moveTo", '"function"');
</span><span class="cx"> shouldBe("typeof path.lineTo", '"function"');
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvasscripttestscanvasstrokepathjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/script-tests/canvas-stroke-path.js (0 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/script-tests/canvas-stroke-path.js (rev 0)
+++ trunk/LayoutTests/fast/canvas/script-tests/canvas-stroke-path.js 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -0,0 +1,67 @@
</span><ins>+description('Test Path2D as argument for stroke.');
+
+function areaColor(data, refColor) {
+ if (!data.length)
+ return true;
+ var c = {r:0,g:0,b:0,a:0};
+ for (var i = 0; i < data.length; i += 4) {
+ c.r += data[i];
+ c.g += data[i+1];
+ c.b += data[i+2];
+ c.a += data[i+3];
+ }
+ if (refColor.r == Math.round(c.r/data.length*4)
+ && refColor.g == Math.round(c.g/data.length*4)
+ && refColor.b == Math.round(c.b/data.length*4)
+ && refColor.a == Math.round(c.a/data.length*4))
+ return true;
+ return false;
+}
+
+var ctx = document.createElement('canvas').getContext('2d');
+document.body.appendChild(ctx.canvas);
+
+var path = new Path2D();
+path.rect(0,0,100,100);
+
+debug('Simple test of Path2D as argumeny for stroke().');
+ctx.strokeStyle = 'rgb(0,255,0)';
+ctx.lineWidth = 20;
+ctx.stroke(path);
+var imageData = ctx.getImageData(0, 0, 10, 10);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+imageData = ctx.getImageData(90, 90, 20, 20);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+debug('');
+
+ctx.clearRect(0,0,300,150);
+debug('Transform context and apply stroke(). Context path should be ignored.');
+ctx.save()
+ctx.scale(2,2);
+ctx.translate(50,50);
+ctx.beginPath();
+ctx.rect(-100,-100,100,100); // Ignore this path.
+ctx.stroke(path);
+ctx.restore();
+imageData = ctx.getImageData(80, 80, 40, 40);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+imageData = ctx.getImageData(280, 130, 20, 20);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+debug('');
+
+ctx.clearRect(0,0,300,150);
+debug('Path2D should not affect context path.');
+ctx.beginPath();
+ctx.rect(100,100,50,50);
+ctx.stroke(path);
+imageData = ctx.getImageData(0, 0, 10, 10);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+imageData = ctx.getImageData(90, 90, 20, 20);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+ctx.clearRect(0,0,300,150);
+ctx.stroke();
+imageData = ctx.getImageData(90, 90, 20, 20);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+imageData = ctx.getImageData(140, 140, 20, 10);
+shouldBe('areaColor(imageData.data, {r:0,g:255,b:0,a:255})', 'true');
+debug('');
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -933,11 +933,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'PageTransitionEvent').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'PageTransitionEvent').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'PageTransitionEvent').configurable is true
</span><del>-PASS Object.getOwnPropertyDescriptor(global, 'Path').value is Path
-PASS Object.getOwnPropertyDescriptor(global, 'Path').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'Path').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'Path').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'Path').configurable is true
</del><ins>+PASS Object.getOwnPropertyDescriptor(global, 'Path2D').value is Path2D
+PASS Object.getOwnPropertyDescriptor(global, 'Path2D').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Path2D').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Path2D').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'Path2D').configurable is true
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'PeriodicWave').value is PeriodicWave
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'PeriodicWave').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'PeriodicWave').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -948,11 +948,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'PageTransitionEvent').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'PageTransitionEvent').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'PageTransitionEvent').configurable is true
</span><del>-PASS Object.getOwnPropertyDescriptor(global, 'Path').value is Path
-PASS Object.getOwnPropertyDescriptor(global, 'Path').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'Path').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'Path').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'Path').configurable is true
</del><ins>+PASS Object.getOwnPropertyDescriptor(global, 'Path2D').value is Path2D
+PASS Object.getOwnPropertyDescriptor(global, 'Path2D').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Path2D').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Path2D').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'Path2D').configurable is true
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'PeriodicWave').value is PeriodicWave
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'PeriodicWave').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'PeriodicWave').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmountainlionjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -938,11 +938,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'PageTransitionEvent').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'PageTransitionEvent').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'PageTransitionEvent').configurable is true
</span><del>-PASS Object.getOwnPropertyDescriptor(global, 'Path').value is Path
-PASS Object.getOwnPropertyDescriptor(global, 'Path').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'Path').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'Path').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'Path').configurable is true
</del><ins>+PASS Object.getOwnPropertyDescriptor(global, 'Path2D').value is Path2D
+PASS Object.getOwnPropertyDescriptor(global, 'Path2D').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Path2D').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Path2D').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'Path2D').configurable is true
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'PeriodicWave').value is PeriodicWave
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'PeriodicWave').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'PeriodicWave').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/Source/WebCore/ChangeLog 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-03-14 Dirk Schulze <krit@webkit.org>
+
+ Refactor Path to Path2D and remove currentPath
+ https://bugs.webkit.org/show_bug.cgi?id=130236
+
+ Reviewed by Dean Jackson.
+
+ Other implementations prefer Path2D over Path. Furthermore, currentPath is not the right
+ way to apply a Path2D object to a context. Main argument is that currentPath creates a copy
+ of the Path2D object. Instead we pass Path2D as argument to fill, stroke and clip now.
+
+ Tests: fast/canvas/canvas-clip-path.html
+ fast/canvas/canvas-fill-path.html
+ fast/canvas/canvas-stroke-path.html
+
+ * bindings/scripts/CodeGeneratorJS.pm: WebIDL parser didn't handle enumerations
+ for overloaded methods at all.
+ (GenerateParametersCheckExpression):
+ * html/canvas/CanvasRenderingContext2D.cpp: New functions with DOMPath argument.
+ (WebCore::CanvasRenderingContext2D::fill):
+ (WebCore::CanvasRenderingContext2D::stroke):
+ (WebCore::CanvasRenderingContext2D::clip):
+ (WebCore::CanvasRenderingContext2D::fillInternal): Internal method to avoid code duplication
+ and copy operation.
+ (WebCore::CanvasRenderingContext2D::strokeInternal): Ditto.
+ (WebCore::CanvasRenderingContext2D::clipInternal): Ditto.
+ * html/canvas/CanvasRenderingContext2D.h:
+ * html/canvas/CanvasRenderingContext2D.idl:
+ * html/canvas/DOMPath.idl: Rename Path to Path2D.
+
</ins><span class="cx"> 2014-03-14 Grzegorz Czajkowski <g.czajkowski@samsung.com>
</span><span class="cx">
</span><span class="cx"> ReplaceSelectionCommand::makeInsertedContentRoundTrippableWithHTMLTreeBuilder should take a const reference to InsertedNodes
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -1403,7 +1403,7 @@
</span><span class="cx"> # are accepted for compatibility. Otherwise, no restrictions are made to
</span><span class="cx"> # match the non-overloaded behavior.
</span><span class="cx"> # FIXME: Implement WebIDL overload resolution algorithm.
</span><del>- if ($codeGenerator->IsStringType($type)) {
</del><ins>+ if ($codeGenerator->IsStringType($type) || $codeGenerator->IsEnumType($type)) {
</ins><span class="cx"> if ($parameter->extendedAttributes->{"StrictTypeChecking"}) {
</span><span class="cx"> push(@andExpression, "(${value}.isUndefinedOrNull() || ${value}.isString() || ${value}.isObject())");
</span><span class="cx"> $usedArguments{$parameterIndex} = 1;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
</span><span class="cx"> * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
</span><span class="cx"> * Copyright (C) 2012 Intel Corporation. All rights reserved.
</span><del>- * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2014 Adobe Systems Incorporated. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -827,22 +827,6 @@
</span><span class="cx"> m_path.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CANVAS_PATH)
-
-PassRefPtr<DOMPath> CanvasRenderingContext2D::currentPath()
-{
- return DOMPath::create(m_path);
-}
-
-void CanvasRenderingContext2D::setCurrentPath(DOMPath* path)
-{
- if (!path)
- return;
- m_path = path->path();
-}
-
-#endif
-
</del><span class="cx"> static bool validateRectForCanvas(float& x, float& y, float& width, float& height)
</span><span class="cx"> {
</span><span class="cx"> if (!std::isfinite(x) | !std::isfinite(y) | !std::isfinite(width) | !std::isfinite(height))
</span><span class="lines">@@ -894,6 +878,50 @@
</span><span class="cx">
</span><span class="cx"> void CanvasRenderingContext2D::fill(const String& windingRuleString)
</span><span class="cx"> {
</span><ins>+ fillInternal(m_path, windingRuleString);
+
+#if ENABLE(DASHBOARD_SUPPORT)
+ clearPathForDashboardBackwardCompatibilityMode();
+#endif
+}
+
+void CanvasRenderingContext2D::stroke()
+{
+ strokeInternal(m_path);
+
+#if ENABLE(DASHBOARD_SUPPORT)
+ clearPathForDashboardBackwardCompatibilityMode();
+#endif
+}
+
+void CanvasRenderingContext2D::clip(const String& windingRuleString)
+{
+ clipInternal(m_path, windingRuleString);
+
+#if ENABLE(DASHBOARD_SUPPORT)
+ clearPathForDashboardBackwardCompatibilityMode();
+#endif
+}
+
+#if ENABLE(CANVAS_PATH)
+void CanvasRenderingContext2D::fill(DOMPath* path, const String& windingRuleString)
+{
+ fillInternal(path->path(), windingRuleString);
+}
+
+void CanvasRenderingContext2D::stroke(DOMPath* path)
+{
+ strokeInternal(path->path());
+}
+
+void CanvasRenderingContext2D::clip(DOMPath* path, const String& windingRuleString)
+{
+ clipInternal(path->path(), windingRuleString);
+}
+#endif
+
+void CanvasRenderingContext2D::fillInternal(const Path& path, const String& windingRuleString)
+{
</ins><span class="cx"> GraphicsContext* c = drawingContext();
</span><span class="cx"> if (!c)
</span><span class="cx"> return;
</span><span class="lines">@@ -905,7 +933,7 @@
</span><span class="cx"> if (gradient && gradient->isZeroSize())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!m_path.isEmpty()) {
</del><ins>+ if (!path.isEmpty()) {
</ins><span class="cx"> WindRule windRule = c->fillRule();
</span><span class="cx"> WindRule newWindRule = RULE_NONZERO;
</span><span class="cx"> if (!parseWinding(windingRuleString, newWindRule))
</span><span class="lines">@@ -913,26 +941,22 @@
</span><span class="cx"> c->setFillRule(newWindRule);
</span><span class="cx">
</span><span class="cx"> if (isFullCanvasCompositeMode(state().m_globalComposite)) {
</span><del>- fullCanvasCompositedFill(m_path);
</del><ins>+ fullCanvasCompositedFill(path);
</ins><span class="cx"> didDrawEntireCanvas();
</span><span class="cx"> } else if (state().m_globalComposite == CompositeCopy) {
</span><span class="cx"> clearCanvas();
</span><del>- c->fillPath(m_path);
</del><ins>+ c->fillPath(path);
</ins><span class="cx"> didDrawEntireCanvas();
</span><span class="cx"> } else {
</span><del>- c->fillPath(m_path);
- didDraw(m_path.fastBoundingRect());
</del><ins>+ c->fillPath(path);
+ didDraw(path.fastBoundingRect());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> c->setFillRule(windRule);
</span><span class="cx"> }
</span><del>-
-#if ENABLE(DASHBOARD_SUPPORT)
- clearPathForDashboardBackwardCompatibilityMode();
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::stroke()
</del><ins>+void CanvasRenderingContext2D::strokeInternal(const Path& path)
</ins><span class="cx"> {
</span><span class="cx"> GraphicsContext* c = drawingContext();
</span><span class="cx"> if (!c)
</span><span class="lines">@@ -945,20 +969,16 @@
</span><span class="cx"> if (gradient && gradient->isZeroSize())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!m_path.isEmpty()) {
- FloatRect dirtyRect = m_path.fastBoundingRect();
</del><ins>+ if (!path.isEmpty()) {
+ FloatRect dirtyRect = path.fastBoundingRect();
</ins><span class="cx"> inflateStrokeRect(dirtyRect);
</span><span class="cx">
</span><del>- c->strokePath(m_path);
</del><ins>+ c->strokePath(path);
</ins><span class="cx"> didDraw(dirtyRect);
</span><span class="cx"> }
</span><del>-
-#if ENABLE(DASHBOARD_SUPPORT)
- clearPathForDashboardBackwardCompatibilityMode();
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::clip(const String& windingRuleString)
</del><ins>+void CanvasRenderingContext2D::clipInternal(const Path& path, const String& windingRuleString)
</ins><span class="cx"> {
</span><span class="cx"> GraphicsContext* c = drawingContext();
</span><span class="cx"> if (!c)
</span><span class="lines">@@ -971,11 +991,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> realizeSaves();
</span><del>- c->canvasClip(m_path, newWindRule);
-
-#if ENABLE(DASHBOARD_SUPPORT)
- clearPathForDashboardBackwardCompatibilityMode();
-#endif
</del><ins>+ c->canvasClip(path, newWindRule);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CanvasRenderingContext2D::isPointInPath(const float x, const float y, const String& windingRuleString)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -131,15 +131,16 @@
</span><span class="cx">
</span><span class="cx"> void beginPath();
</span><span class="cx">
</span><del>-#if ENABLE(CANVAS_PATH)
- PassRefPtr<DOMPath> currentPath();
- void setCurrentPath(DOMPath*);
-#endif
-
</del><span class="cx"> void fill(const String& winding = "nonzero");
</span><span class="cx"> void stroke();
</span><span class="cx"> void clip(const String& winding = "nonzero");
</span><span class="cx">
</span><ins>+#if ENABLE(CANVAS_PATH)
+ void fill(DOMPath*, const String& winding = "nonzero");
+ void stroke(DOMPath*);
+ void clip(DOMPath*, const String& winding = "nonzero");
+#endif
+
</ins><span class="cx"> bool isPointInPath(const float x, const float y, const String& winding = "nonzero");
</span><span class="cx"> bool isPointInStroke(const float x, const float y);
</span><span class="cx">
</span><span class="lines">@@ -298,6 +299,10 @@
</span><span class="cx"> void clearPathForDashboardBackwardCompatibilityMode();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ void fillInternal(const Path&, const String& winding);
+ void strokeInternal(const Path&);
+ void clipInternal(const Path&, const String& winding);
+
</ins><span class="cx"> void clearCanvas();
</span><span class="cx"> Path transformAreaToDevice(const Path&) const;
</span><span class="cx"> Path transformAreaToDevice(const FloatRect&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Didl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -64,10 +64,6 @@
</span><span class="cx">
</span><span class="cx"> void beginPath();
</span><span class="cx">
</span><del>-#if defined(ENABLE_CANVAS_PATH) && ENABLE_CANVAS_PATH
- attribute DOMPath currentPath;
-#endif
-
</del><span class="cx"> // FIXME: These methods should be shared with CanvasRenderingContext2D in the CanvasPathMethods interface.
</span><span class="cx"> void closePath();
</span><span class="cx"> void moveTo(float x, float y);
</span><span class="lines">@@ -78,9 +74,16 @@
</span><span class="cx"> void rect(float x, float y, float width, float height);
</span><span class="cx"> [RaisesException] void arc(float x, float y, float radius, float startAngle, float endAngle, [Default=Undefined] optional boolean anticlockwise);
</span><span class="cx">
</span><ins>+#if defined(ENABLE_CANVAS_PATH) && ENABLE_CANVAS_PATH
+ void fill(DOMPath? path, optional CanvasWindingRule winding);
+ void stroke(DOMPath? path);
+ void clip(DOMPath? path, optional CanvasWindingRule winding);
+#endif
+
</ins><span class="cx"> void fill(optional CanvasWindingRule winding);
</span><span class="cx"> void stroke();
</span><span class="cx"> void clip(optional CanvasWindingRule winding);
</span><ins>+
</ins><span class="cx"> boolean isPointInPath(float x, float y, optional CanvasWindingRule winding);
</span><span class="cx"> boolean isPointInStroke(float x, float y);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasDOMPathidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/DOMPath.idl (165650 => 165651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/DOMPath.idl 2014-03-14 21:29:18 UTC (rev 165650)
+++ trunk/Source/WebCore/html/canvas/DOMPath.idl 2014-03-14 21:43:26 UTC (rev 165651)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> Constructor(DOMPath path),
</span><span class="cx"> Constructor(DOMString text),
</span><span class="cx"> Conditional=CANVAS_PATH,
</span><del>- InterfaceName=Path,
</del><ins>+ InterfaceName=Path2D,
</ins><span class="cx"> ] interface DOMPath {
</span><span class="cx">
</span><span class="cx"> // FIXME: These methods should be shared with CanvasRenderingContext2D in the CanvasPathMethods interface.
</span></span></pre>
</div>
</div>
</body>
</html>