<!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>[165910] 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/165910">165910</a></dd>
<dt>Author</dt> <dd>krit@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-19 12:54:42 -0700 (Wed, 19 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement method addPath for Path2D
https://bugs.webkit.org/show_bug.cgi?id=130461
Reviewed by Dean Jackson.
Source/WebCore:
Add support for the Path2D method addPath. The method allows
to append and existing Path2D object to another one. It can be
combined with a transformation matrix SVGMatrix.
Test: fast/canvas/canvas-path-addPath.html
* html/canvas/DOMPath.h: Add new method addPath().
(WebCore::DOMPath::addPath):
* html/canvas/DOMPath.idl:
* platform/graphics/Path.h: Add support for appending paths.
* platform/graphics/cairo/PathCairo.cpp:
(WebCore::Path::addPath):
* platform/graphics/cg/PathCG.cpp:
(WebCore::Path::addPath):
* platform/graphics/wince/PathWinCE.cpp:
(WebCore::Path::addPath):
LayoutTests:
Test the addPath Path2D method.
* platform/efl/TestExpectations:
* platform/gtk/TestExpectations:
* fast/canvas/canvas-path-addPath-expected.txt: Added.
* fast/canvas/canvas-path-addPath.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasDOMPathh">trunk/Source/WebCore/html/canvas/DOMPath.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasDOMPathidl">trunk/Source/WebCore/html/canvas/DOMPath.idl</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPathh">trunk/Source/WebCore/platform/graphics/Path.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoPathCairocpp">trunk/Source/WebCore/platform/graphics/cairo/PathCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgPathCGcpp">trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswincePathWinCEcpp">trunk/Source/WebCore/platform/graphics/wince/PathWinCE.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcanvascanvaspathaddPathexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-path-addPath-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvaspathaddPathhtml">trunk/LayoutTests/fast/canvas/canvas-path-addPath.html</a></li>
<li><a href="#trunkLayoutTestsfastcanvasscripttestscanvaspathaddPathjs">trunk/LayoutTests/fast/canvas/script-tests/canvas-path-addPath.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165909 => 165910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-19 19:32:43 UTC (rev 165909)
+++ trunk/LayoutTests/ChangeLog 2014-03-19 19:54:42 UTC (rev 165910)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-19 Dirk Schulze <krit@webkit.org>
+
+ Implement method addPath for Path2D
+ https://bugs.webkit.org/show_bug.cgi?id=130461
+
+ Reviewed by Dean Jackson.
+
+ Test the addPath Path2D method.
+
+ * platform/efl/TestExpectations:
+ * platform/gtk/TestExpectations:
+ * fast/canvas/canvas-path-addPath-expected.txt: Added.
+ * fast/canvas/canvas-path-addPath.html: Added.
+
</ins><span class="cx"> 2014-03-19 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix cue rendering test and include support for left/right alignment
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvaspathaddPathexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-path-addPath-expected.txt (0 => 165910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-path-addPath-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-path-addPath-expected.txt 2014-03-19 19:54:42 UTC (rev 165910)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+Test addPath of Path2D.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Add path B with path data to path A without path data.
+PASS refTest(result.data, expected.data) is true
+
+Add empty path B to path A with path data.
+PASS refTest(result.data, expected.data) is true
+
+Add path with path data B to path A with path data.
+PASS refTest(result.data, expected.data) is true
+
+Add path with path data B to path A with path data. Fill with winding rule evenodd.
+PASS refTest(result.data, expected.data) is true
+
+Add path B to path A with transformation matrix.
+PASS refTest(result.data, expected.data) is true
+
+Add path A to itself with transformation matrix.
+PASS refTest(result.data, expected.data) is true
+
+Add path B to path A with singular transformation matrix (1).
+PASS refTest(result.data, expected.data) is true
+
+Add path B to path A with singular transformation matrix (2).
+PASS refTest(result.data, expected.data) is true
+
+Add path B to path A with singular transformation matrix (3).
+PASS refTest(result.data, expected.data) is true
+
+Various tests of invalid values.
+PASS pathA.addPath(matrix, pathB) threw exception Error: TypeMismatchError: DOM Exception 17.
+PASS pathA.addPath(pathB, ctx.canvas) threw exception Error: TypeMismatchError: DOM Exception 17.
+PASS pathA.addPath(pathB, null) threw exception Error: TypeMismatchError: DOM Exception 17.
+PASS pathA.addPath(pathB, undefined) threw exception Error: TypeMismatchError: DOM Exception 17.
+PASS pathA.addPath(pathB, 0) threw exception Error: TypeMismatchError: DOM Exception 17.
+PASS pathA.addPath(pathB, "0") threw exception Error: TypeMismatchError: DOM Exception 17.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvaspathaddPathhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-path-addPath.html (0 => 165910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-path-addPath.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-path-addPath.html 2014-03-19 19:54:42 UTC (rev 165910)
</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-path-addPath.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvasscripttestscanvaspathaddPathjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/script-tests/canvas-path-addPath.js (0 => 165910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/script-tests/canvas-path-addPath.js (rev 0)
+++ trunk/LayoutTests/fast/canvas/script-tests/canvas-path-addPath.js 2014-03-19 19:54:42 UTC (rev 165910)
</span><span class="lines">@@ -0,0 +1,250 @@
</span><ins>+description('Test addPath of Path2D.');
+
+function refTest(result, expected) {
+ if (!result.length)
+ return true;
+ if (result.length != expected.length)
+ return false;
+ for (var i = 0; i < result.length; ++i) {
+ if (result[i] != expected[i])
+ return false;
+ }
+ return true;
+}
+
+var ctx = document.createElement('canvas').getContext('2d');
+document.body.appendChild(ctx.canvas);
+ctx.fillStyle = 'green';
+var matrix = document.createElementNS('http://www.w3.org/2000/svg','svg').createSVGMatrix();
+
+
+debug('Add path B with path data to path A without path data.');
+var pathA = new Path2D();
+var pathB = new Path2D();
+pathB.rect(0,0,100,100);
+pathA.addPath(pathB);
+ctx.fill(pathA);
+
+// Compare results with reference drawing.
+var result = ctx.getImageData(0, 0, 150, 150);
+ctx.clearRect(0,0,300,150);
+ctx.beginPath();
+ctx.fillRect(0,0,100,100);
+var expected = ctx.getImageData(0, 0, 150, 150);
+shouldBe('refTest(result.data, expected.data)', 'true');
+ctx.clearRect(0,0,300,150);
+debug('');
+
+
+debug('Add empty path B to path A with path data.');
+pathA = new Path2D();
+pathA.rect(0,0,100,100);
+pathB = new Path2D();
+pathA.addPath(pathB);
+ctx.fill(pathA);
+
+// Compare results with reference drawing.
+result = ctx.getImageData(0, 0, 150, 150);
+ctx.clearRect(0,0,300,150);
+ctx.beginPath();
+ctx.fillRect(0,0,100,100);
+expected = ctx.getImageData(0, 0, 150, 150);
+shouldBe('refTest(result.data, expected.data)', 'true');
+ctx.clearRect(0,0,300,150);
+debug('');
+
+
+debug('Add path with path data B to path A with path data.');
+pathA = new Path2D();
+pathA.rect(0,0,100,100);
+pathB = new Path2D();
+pathB.rect(20,20,100,100);
+pathA.addPath(pathB);
+ctx.fill(pathA);
+
+// Compare results with reference drawing.
+result = ctx.getImageData(0, 0, 150, 150);
+ctx.clearRect(0,0,300,150);
+ctx.beginPath();
+ctx.rect(0,0,100,100);
+ctx.rect(20,20,100,100);
+ctx.fill();
+expected = ctx.getImageData(0, 0, 150, 150);
+shouldBe('refTest(result.data, expected.data)', 'true');
+ctx.clearRect(0,0,300,150);
+debug('');
+
+
+debug('Add path with path data B to path A with path data. Fill with winding rule evenodd.');
+pathA = new Path2D();
+pathA.rect(0,0,100,100);
+pathB = new Path2D();
+pathB.rect(20,20,100,100);
+pathA.addPath(pathB);
+ctx.fill(pathA, 'evenodd');
+
+// Compare results with reference drawing.
+result = ctx.getImageData(0, 0, 150, 150);
+ctx.clearRect(0,0,300,150);
+ctx.beginPath();
+ctx.rect(0,0,100,100);
+ctx.rect(20,20,100,100);
+ctx.fill('evenodd');
+expected = ctx.getImageData(0, 0, 150, 150);
+shouldBe('refTest(result.data, expected.data)', 'true');
+ctx.clearRect(0,0,300,150);
+debug('');
+
+
+debug('Add path B to path A with transformation matrix.');
+pathA = new Path2D();
+pathA.rect(0,0,100,100);
+pathB = new Path2D();
+pathB.rect(20,20,100,100);
+matrix = matrix.translate(30,-20);
+matrix = matrix.scale(1.5,1.5);
+pathA.addPath(pathB, matrix);
+ctx.fill(pathA);
+
+// Compare results with reference drawing.
+result = ctx.getImageData(0, 0, 150, 150);
+ctx.clearRect(0,0,300,150);
+ctx.save();
+ctx.beginPath();
+ctx.rect(0,0,100,100);
+ctx.translate(30,-20);
+ctx.scale(1.5,1.5);
+ctx.rect(20,20,100,100);
+ctx.fill();
+ctx.restore();
+expected = ctx.getImageData(0, 0, 150, 150);
+shouldBe('refTest(result.data, expected.data)', 'true');
+ctx.clearRect(0,0,300,150);
+debug('');
+
+
+debug('Add path A to itself with transformation matrix.');
+pathA = new Path2D();
+pathA.rect(0,0,100,100);
+matrix.a = 1;
+matrix.b = 0;
+matrix.c = 0;
+matrix.d = 1;
+matrix.e = 20;
+matrix.f = 20;
+pathA.addPath(pathA, matrix);
+ctx.fill(pathA);
+
+// Compare results with reference drawing.
+result = ctx.getImageData(0, 0, 150, 150);
+ctx.clearRect(0,0,300,150);
+ctx.save();
+ctx.beginPath();
+ctx.rect(0,0,100,100);
+ctx.translate(20,20);
+ctx.rect(0,0,100,100);
+ctx.fill();
+ctx.restore();
+expected = ctx.getImageData(0, 0, 150, 150);
+shouldBe('refTest(result.data, expected.data)', 'true');
+ctx.clearRect(0,0,300,150);
+debug('');
+
+
+debug('Add path B to path A with singular transformation matrix (1).');
+matrix.a = 0;
+matrix.b = 0;
+matrix.c = 0;
+matrix.d = 0;
+matrix.e = 0;
+matrix.f = 0;
+pathA = new Path2D();
+pathA.rect(0,0,100,100);
+pathB = new Path2D();
+pathB.rect(20,20,100,100);
+pathA.addPath(pathB, matrix);
+ctx.fill(pathA);
+
+// Compare results with reference drawing.
+result = ctx.getImageData(0, 0, 150, 150);
+ctx.clearRect(0,0,300,150);
+ctx.save();
+ctx.beginPath();
+ctx.rect(0,0,100,100);
+ctx.fill();
+expected = ctx.getImageData(0, 0, 150, 150);
+shouldBe('refTest(result.data, expected.data)', 'true');
+ctx.clearRect(0,0,300,150);
+debug('');
+
+
+debug('Add path B to path A with singular transformation matrix (2).');
+matrix.a = Math.NaN;
+matrix.b = Math.NaN;
+matrix.c = Math.NaN;
+matrix.d = Math.NaN;
+matrix.e = Math.NaN;
+matrix.f = Math.NaN;
+pathA = new Path2D();
+pathA.rect(0,0,100,100);
+pathB = new Path2D();
+pathB.rect(20,20,100,100);
+pathA.addPath(pathB, matrix);
+ctx.fill(pathA);
+
+// Compare results with reference drawing.
+result = ctx.getImageData(0, 0, 150, 150);
+ctx.clearRect(0,0,300,150);
+ctx.save();
+ctx.beginPath();
+ctx.rect(0,0,100,100);
+ctx.fill();
+expected = ctx.getImageData(0, 0, 150, 150);
+shouldBe('refTest(result.data, expected.data)', 'true');
+ctx.clearRect(0,0,300,150);
+debug('');
+
+
+debug('Add path B to path A with singular transformation matrix (3).');
+matrix.a = Math.Infinity;
+matrix.b = Math.Infinity;
+matrix.c = Math.Infinity;
+matrix.d = Math.Infinity;
+matrix.e = Math.Infinity;
+matrix.f = Math.Infinity;
+pathA = new Path2D();
+pathA.rect(0,0,100,100);
+pathB = new Path2D();
+pathB.rect(20,20,100,100);
+pathA.addPath(pathB, matrix);
+ctx.fill(pathA);
+
+// Compare results with reference drawing.
+result = ctx.getImageData(0, 0, 150, 150);
+ctx.clearRect(0,0,300,150);
+ctx.save();
+ctx.beginPath();
+ctx.rect(0,0,100,100);
+ctx.fill();
+expected = ctx.getImageData(0, 0, 150, 150);
+shouldBe('refTest(result.data, expected.data)', 'true');
+ctx.clearRect(0,0,300,150);
+debug('');
+
+
+debug('Various tests of invalid values.');
+matrix.a = 1;
+matrix.b = 0;
+matrix.c = 0;
+matrix.d = 1;
+matrix.e = 0;
+matrix.f = 0;
+pathA = new Path2D();
+pathB = new Path2D();
+shouldThrow('pathA.addPath(matrix, pathB)');
+shouldThrow('pathA.addPath(pathB, ctx.canvas)');
+shouldThrow('pathA.addPath(pathB, null)');
+shouldThrow('pathA.addPath(pathB, undefined)');
+shouldThrow('pathA.addPath(pathB, 0)');
+shouldThrow('pathA.addPath(pathB, "0")');
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/TestExpectations (165909 => 165910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/TestExpectations 2014-03-19 19:32:43 UTC (rev 165909)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2014-03-19 19:54:42 UTC (rev 165910)
</span><span class="lines">@@ -204,6 +204,9 @@
</span><span class="cx"> # Tests for features under development
</span><span class="cx"> # ------------------------------------
</span><span class="cx">
</span><ins>+# Path::addPath needs to be implemented
+webkit.org/b/130464 fast/canvas/canvas-path-addPath.html
+
</ins><span class="cx"> # Unclassified failures
</span><span class="cx"> fast/events/platform-wheelevent-paging-x-in-non-scrolling-div.html
</span><span class="cx"> fast/events/platform-wheelevent-paging-x-in-non-scrolling-page.html
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (165909 => 165910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2014-03-19 19:32:43 UTC (rev 165909)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2014-03-19 19:54:42 UTC (rev 165910)
</span><span class="lines">@@ -823,6 +823,9 @@
</span><span class="cx"> # Tests failing
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx">
</span><ins>+# Path::addPath needs to be implemented
+webkit.org/b/130464 fast/canvas/canvas-path-addPath.html
+
</ins><span class="cx"> webkit.org/b/73766 css3/unicode-bidi-isolate-aharon-failing.html [ ImageOnlyFailure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/79757 fast/selectors/selection-window-inactive.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165909 => 165910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-19 19:32:43 UTC (rev 165909)
+++ trunk/Source/WebCore/ChangeLog 2014-03-19 19:54:42 UTC (rev 165910)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-03-19 Dirk Schulze <krit@webkit.org>
+
+ Implement method addPath for Path2D
+ https://bugs.webkit.org/show_bug.cgi?id=130461
+
+ Reviewed by Dean Jackson.
+
+ Add support for the Path2D method addPath. The method allows
+ to append and existing Path2D object to another one. It can be
+ combined with a transformation matrix SVGMatrix.
+
+ Test: fast/canvas/canvas-path-addPath.html
+
+ * html/canvas/DOMPath.h: Add new method addPath().
+ (WebCore::DOMPath::addPath):
+ * html/canvas/DOMPath.idl:
+ * platform/graphics/Path.h: Add support for appending paths.
+ * platform/graphics/cairo/PathCairo.cpp:
+ (WebCore::Path::addPath):
+ * platform/graphics/cg/PathCG.cpp:
+ (WebCore::Path::addPath):
+ * platform/graphics/wince/PathWinCE.cpp:
+ (WebCore::Path::addPath):
+
</ins><span class="cx"> 2014-03-19 Yongjun Zhang <yongjun_zhang@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] WebKit2 Quicklook.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasDOMPathh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/DOMPath.h (165909 => 165910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/DOMPath.h 2014-03-19 19:32:43 UTC (rev 165909)
+++ trunk/Source/WebCore/html/canvas/DOMPath.h 2014-03-19 19:54:42 UTC (rev 165910)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #if ENABLE(CANVAS_PATH)
</span><span class="cx">
</span><span class="cx"> #include "CanvasPathMethods.h"
</span><ins>+#include "SVGMatrix.h"
</ins><span class="cx"> #include "SVGPathUtilities.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -51,6 +52,14 @@
</span><span class="cx"> return create(path);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void addPath(const DOMPath* path) { addPath(path, AffineTransform()); }
+ void addPath(const DOMPath* path, const AffineTransform& transform)
+ {
+ if (!path || !transform.isInvertible())
+ return;
+ m_path.addPath(path->path(), transform);
+ }
+
</ins><span class="cx"> const Path& path() const { return m_path; }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasDOMPathidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/DOMPath.idl (165909 => 165910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/DOMPath.idl 2014-03-19 19:32:43 UTC (rev 165909)
+++ trunk/Source/WebCore/html/canvas/DOMPath.idl 2014-03-19 19:54:42 UTC (rev 165910)
</span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx"> InterfaceName=Path2D,
</span><span class="cx"> ] interface DOMPath {
</span><span class="cx">
</span><ins>+ void addPath(DOMPath? path, optional SVGMatrix? transform);
+
</ins><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([Default=Undefined] optional float x,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPathh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Path.h (165909 => 165910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Path.h 2014-03-19 19:32:43 UTC (rev 165909)
+++ trunk/Source/WebCore/platform/graphics/Path.h 2014-03-19 19:54:42 UTC (rev 165910)
</span><span class="lines">@@ -133,6 +133,8 @@
</span><span class="cx"> void addRoundedRect(const FloatRoundedRect&, RoundedRectStrategy = PreferNativeRoundedRect);
</span><span class="cx"> void addRoundedRect(const RoundedRect&);
</span><span class="cx">
</span><ins>+ void addPath(const Path&, const AffineTransform&);
+
</ins><span class="cx"> void translate(const FloatSize&);
</span><span class="cx">
</span><span class="cx"> // To keep Path() cheap, it does not allocate a PlatformPath immediately
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoPathCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/PathCairo.cpp (165909 => 165910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/PathCairo.cpp 2014-03-19 19:32:43 UTC (rev 165909)
+++ trunk/Source/WebCore/platform/graphics/cairo/PathCairo.cpp 2014-03-19 19:54:42 UTC (rev 165910)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "AffineTransform.h"
</span><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><ins>+#include "NotImplemented.h"
</ins><span class="cx"> #include "OwnPtrCairo.h"
</span><span class="cx"> #include "PlatformPathCairo.h"
</span><span class="cx"> #include "StrokeStyleApplier.h"
</span><span class="lines">@@ -293,6 +294,12 @@
</span><span class="cx"> cairo_restore(cr);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Path::addPath(const Path&, const AffineTransform&)
+{
+ // FIXME: This should probably be very similar to Path::transform.
+ notImplemented();
+}
+
</ins><span class="cx"> void Path::closeSubpath()
</span><span class="cx"> {
</span><span class="cx"> cairo_t* cr = ensurePlatformPath()->context();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgPathCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp (165909 => 165910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp 2014-03-19 19:32:43 UTC (rev 165909)
+++ trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp 2014-03-19 19:54:42 UTC (rev 165910)
</span><span class="lines">@@ -299,6 +299,24 @@
</span><span class="cx"> CGPathAddEllipseInRect(ensurePlatformPath(), 0, r);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Path::addPath(const Path& path, const AffineTransform& transform)
+{
+ if (!path.platformPath())
+ return;
+
+ CGAffineTransform transformCG = transform;
+ // CG doesn't allow adding a path to itself. Optimize for the common case
+ // and copy the path for the self referencing case.
+ if (ensurePlatformPath() != path.platformPath()) {
+ CGPathAddPath(ensurePlatformPath(), &transformCG, path.platformPath());
+ return;
+ }
+ CGPathRef pathCopy = CGPathCreateCopy(path.platformPath());
+ CGPathAddPath(ensurePlatformPath(), &transformCG, path.platformPath());
+ CGPathRelease(pathCopy);
+}
+
+
</ins><span class="cx"> void Path::clear()
</span><span class="cx"> {
</span><span class="cx"> if (isNull())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswincePathWinCEcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/wince/PathWinCE.cpp (165909 => 165910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/PathWinCE.cpp 2014-03-19 19:32:43 UTC (rev 165909)
+++ trunk/Source/WebCore/platform/graphics/wince/PathWinCE.cpp 2014-03-19 19:54:42 UTC (rev 165910)
</span><span class="lines">@@ -113,6 +113,11 @@
</span><span class="cx"> m_path->addEllipse(r);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Path::addPath(const Path&, const AffineTransform&)
+{
+ notImplemented();
+}
+
</ins><span class="cx"> void Path::clear()
</span><span class="cx"> {
</span><span class="cx"> m_path->clear();
</span></span></pre>
</div>
</div>
</body>
</html>