<!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>[190913] trunk/PerformanceTests</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/190913">190913</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2015-10-12 18:18:03 -0700 (Mon, 12 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add canvas path tests
https://bugs.webkit.org/show_bug.cgi?id=150067
rdar://problem/23081463
Reviewed by Dean Jackson.
* Animometer/runner/resources/tests.js: Add a quadratic and bezier path test.
* Animometer/tests/simple/resources/simple-canvas.js:
(SimpleCanvasStage.prototype.tune): This kind of test joins all of the segments
into one long path, and tries to render that one path. Random points make it
difficult to tell what is going on, so add a parameter to the constructor to
confine the area where the random coordinates can land. The more complicated the
case is, the larger an area the path will cover. Add an artificial minimum so
that the first 200 points aren't confined to a space that is too small.
* Animometer/tests/simple/resources/simple-canvas-paths.js:
(SimpleCanvasPathStrokeStage): Add a new kind of stage that inherits from
SimpleCanvasStage. Each time the frame animates a random line width and stroke
color are chosen. The path setup is done outside of each paint object.
(CanvasQuadraticPoint): This point just calls quadraticCurveTo.
(CanvasPathBenchmark.prototype.createStage): Add the tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsAnimometerrunnerresourcestestsjs">trunk/PerformanceTests/Animometer/runner/resources/tests.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestssimpleresourcessimplecanvaspathsjs">trunk/PerformanceTests/Animometer/tests/simple/resources/simple-canvas-paths.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestssimpleresourcessimplecanvasjs">trunk/PerformanceTests/Animometer/tests/simple/resources/simple-canvas.js</a></li>
<li><a href="#trunkPerformanceTestsChangeLog">trunk/PerformanceTests/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkPerformanceTestsAnimometerrunnerresourcestestsjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/runner/resources/tests.js (190912 => 190913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/runner/resources/tests.js 2015-10-13 01:11:45 UTC (rev 190912)
+++ trunk/PerformanceTests/Animometer/runner/resources/tests.js 2015-10-13 01:18:03 UTC (rev 190913)
</span><span class="lines">@@ -143,10 +143,18 @@
</span><span class="cx"> name: "Canvas quadratic segments"
</span><span class="cx"> },
</span><span class="cx"> {
</span><ins>+ url: "simple/simple-canvas-paths.html?pathType=quadraticPath",
+ name: "Canvas quadratic path"
+ },
+ {
</ins><span class="cx"> url: "simple/simple-canvas-paths.html?pathType=bezier",
</span><span class="cx"> name: "Canvas bezier segments"
</span><span class="cx"> },
</span><span class="cx"> {
</span><ins>+ url: "simple/simple-canvas-paths.html?pathType=bezierPath",
+ name: "Canvas bezier path"
+ },
+ {
</ins><span class="cx"> url: "simple/simple-canvas-paths.html?&pathType=arcTo",
</span><span class="cx"> name: "Canvas arcTo segments"
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestssimpleresourcessimplecanvaspathsjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/simple/resources/simple-canvas-paths.js (190912 => 190913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/simple/resources/simple-canvas-paths.js 2015-10-13 01:11:45 UTC (rev 190912)
+++ trunk/PerformanceTests/Animometer/tests/simple/resources/simple-canvas-paths.js 2015-10-13 01:18:03 UTC (rev 190913)
</span><span class="lines">@@ -19,6 +19,15 @@
</span><span class="cx"> context.stroke();
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+function CanvasQuadraticPoint(stage, coordinateMaximum) {
+ var pointMaximum = new Point(Math.min(stage.size.x, coordinateMaximum), Math.min(stage.size.y, coordinateMaximum));
+ this._point1 = stage.randomPosition(pointMaximum);
+ this._point2 = stage.randomPosition(pointMaximum);
+};
+CanvasQuadraticPoint.prototype.draw = function(context) {
+ context.quadraticCurveTo(this._point1.x, this._point1.y, this._point2.x, this._point2.y);
+};
+
</ins><span class="cx"> function CanvasBezierSegment(stage) {
</span><span class="cx"> var maxSize = stage.randomInt(20, 200);
</span><span class="cx"> var toCenter = stage.randomPosition(stage.size).subtract(new Point(maxSize/2, maxSize/2));
</span><span class="lines">@@ -39,6 +48,16 @@
</span><span class="cx"> context.stroke();
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+function CanvasBezierPoint(stage, coordinateMaximum) {
+ var pointMaximum = new Point(Math.min(stage.size.x, coordinateMaximum), Math.min(stage.size.y, coordinateMaximum));
+ this._point1 = stage.randomPosition(pointMaximum);
+ this._point2 = stage.randomPosition(pointMaximum);
+ this._point3 = stage.randomPosition(pointMaximum);
+};
+CanvasBezierPoint.prototype.draw = function(context) {
+ context.bezierCurveTo(this._point1.x, this._point1.y, this._point2.x, this._point2.y, this._point3.x, this._point3.y);
+};
+
</ins><span class="cx"> function CanvasArcToSegment(stage) {
</span><span class="cx"> var maxSize = stage.randomInt(20, 200);
</span><span class="cx"> var toCenter = stage.randomPosition(stage.size).subtract(new Point(maxSize/2, maxSize/2));
</span><span class="lines">@@ -104,6 +123,25 @@
</span><span class="cx"> context.fill();
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+// === STAGES ===
+
+function SimpleCanvasPathStrokeStage(element, options, canvasObject) {
+ SimpleCanvasStage.call(this, element, options, canvasObject);
+}
+SimpleCanvasPathStrokeStage.prototype = Object.create(SimpleCanvasStage.prototype);
+SimpleCanvasPathStrokeStage.prototype.constructor = SimpleCanvasPathStrokeStage;
+SimpleCanvasPathStrokeStage.prototype.animate = function() {
+ var context = this.context;
+ context.lineWidth = this.randomInt(1, 20);
+ context.strokeStyle = this.randomColor();
+ context.beginPath();
+ context.moveTo(0,0);
+ this._objects.forEach(function(object) {
+ object.draw(context);
+ });
+ context.stroke();
+}
+
</ins><span class="cx"> // === BENCHMARK ===
</span><span class="cx">
</span><span class="cx"> function CanvasPathBenchmark(suite, test, options, recordTable, progressBar) {
</span><span class="lines">@@ -116,8 +154,12 @@
</span><span class="cx"> switch (this._options["pathType"]) {
</span><span class="cx"> case "quadratic":
</span><span class="cx"> return new SimpleCanvasStage(element, this._options, CanvasQuadraticSegment);
</span><ins>+ case "quadraticPath":
+ return new SimpleCanvasPathStrokeStage(element, this._options, CanvasQuadraticPoint);
</ins><span class="cx"> case "bezier":
</span><span class="cx"> return new SimpleCanvasStage(element, this._options, CanvasBezierSegment);
</span><ins>+ case "bezierPath":
+ return new SimpleCanvasPathStrokeStage(element, this._options, CanvasBezierPoint);
</ins><span class="cx"> case "arcTo":
</span><span class="cx"> return new SimpleCanvasStage(element, this._options, CanvasArcToSegment);
</span><span class="cx"> case "arc":
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestssimpleresourcessimplecanvasjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/simple/resources/simple-canvas.js (190912 => 190913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/simple/resources/simple-canvas.js 2015-10-13 01:11:45 UTC (rev 190912)
+++ trunk/PerformanceTests/Animometer/tests/simple/resources/simple-canvas.js 2015-10-13 01:18:03 UTC (rev 190913)
</span><span class="lines">@@ -14,8 +14,11 @@
</span><span class="cx"> return this._objects.length;
</span><span class="cx">
</span><span class="cx"> if (count > 0) {
</span><ins>+ // For path-based tests, use the object length as a maximum coordinate value
+ // to make it easier to see what the test is doing
+ var coordinateMaximum = Math.max(this._objects.length, 200);
</ins><span class="cx"> for (var i = 0; i < count; ++i) {
</span><del>- this._objects.push(new this.canvasObject(this));
</del><ins>+ this._objects.push(new this.canvasObject(this, coordinateMaximum));
</ins><span class="cx"> }
</span><span class="cx"> return this._objects.length;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (190912 => 190913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog 2015-10-13 01:11:45 UTC (rev 190912)
+++ trunk/PerformanceTests/ChangeLog 2015-10-13 01:18:03 UTC (rev 190913)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2015-10-12 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><ins>+ Add canvas path tests
+ https://bugs.webkit.org/show_bug.cgi?id=150067
+ rdar://problem/23081463
+
+ Reviewed by Dean Jackson.
+
+ * Animometer/runner/resources/tests.js: Add a quadratic and bezier path test.
+
+ * Animometer/tests/simple/resources/simple-canvas.js:
+ (SimpleCanvasStage.prototype.tune): This kind of test joins all of the segments
+ into one long path, and tries to render that one path. Random points make it
+ difficult to tell what is going on, so add a parameter to the constructor to
+ confine the area where the random coordinates can land. The more complicated the
+ case is, the larger an area the path will cover. Add an artificial minimum so
+ that the first 200 points aren't confined to a space that is too small.
+
+ * Animometer/tests/simple/resources/simple-canvas-paths.js:
+ (SimpleCanvasPathStrokeStage): Add a new kind of stage that inherits from
+ SimpleCanvasStage. Each time the frame animates a random line width and stroke
+ color are chosen. The path setup is done outside of each paint object.
+ (CanvasQuadraticPoint): This point just calls quadraticCurveTo.
+ (CanvasPathBenchmark.prototype.createStage): Add the tests.
+
+2015-10-12 Jon Lee <jonlee@apple.com>
+
</ins><span class="cx"> Add basic canvas tests
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150066
</span><span class="cx"> rdar://problem/23081143
</span></span></pre>
</div>
</div>
</body>
</html>