<!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>[196289] 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/196289">196289</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2016-02-08 19:30:18 -0800 (Mon, 08 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of options member variable in Benchmark.
Options are only needed when initializing the stage or benchmark, so there's no
need to also keep a reference to it.
* Animometer/tests/resources/main.js: Get rid of options variable in Benchmark.
Pass options to Controllers and Stages.
(Controller.Utilities.createClass):
(Benchmark.Utilities.createClass):
(get options): Deleted.
* Animometer/tests/bouncing-particles/resources/bouncing-canvas-images.js:
* Animometer/tests/bouncing-particles/resources/bouncing-canvas-particles.js:
* Animometer/tests/bouncing-particles/resources/bouncing-canvas-shapes.js:
* Animometer/tests/bouncing-particles/resources/bouncing-css-images.js:
* Animometer/tests/bouncing-particles/resources/bouncing-css-shapes.js:
* Animometer/tests/bouncing-particles/resources/bouncing-particles.js:
* Animometer/tests/bouncing-particles/resources/bouncing-svg-images.js:
* Animometer/tests/bouncing-particles/resources/bouncing-svg-shapes.js:
* Animometer/tests/master/resources/canvas-stage.js:
* Animometer/tests/master/resources/canvas-tests.js:
* Animometer/tests/master/resources/particles.js:
* Animometer/tests/misc/resources/canvas-electrons.js:
* Animometer/tests/misc/resources/canvas-stars.js:
* Animometer/tests/misc/resources/compositing-transforms.js:
* Animometer/tests/simple/resources/simple-canvas-paths.js:
* Animometer/tests/simple/resources/tiled-canvas-image.js:
* Animometer/tests/template/resources/template-canvas.js:
* Animometer/tests/template/resources/template-css.js:
* Animometer/tests/template/resources/template-svg.js:
* Animometer/tests/text/resources/layering-text.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingcanvasimagesjs">trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-canvas-images.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingcanvasparticlesjs">trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-canvas-particles.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingcanvasshapesjs">trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-canvas-shapes.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingcssimagesjs">trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-css-images.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingcssshapesjs">trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-css-shapes.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingparticlesjs">trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-particles.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingsvgimagesjs">trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-svg-images.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingsvgshapesjs">trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-svg-shapes.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsmasterresourcescanvasstagejs">trunk/PerformanceTests/Animometer/tests/master/resources/canvas-stage.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsmasterresourcescanvastestsjs">trunk/PerformanceTests/Animometer/tests/master/resources/canvas-tests.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsmasterresourcesparticlesjs">trunk/PerformanceTests/Animometer/tests/master/resources/particles.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsmiscresourcescanvaselectronsjs">trunk/PerformanceTests/Animometer/tests/misc/resources/canvas-electrons.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsmiscresourcescanvasstarsjs">trunk/PerformanceTests/Animometer/tests/misc/resources/canvas-stars.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsmiscresourcescompositingtransformsjs">trunk/PerformanceTests/Animometer/tests/misc/resources/compositing-transforms.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsresourcesmainjs">trunk/PerformanceTests/Animometer/tests/resources/main.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestssimpleresourcessimplecanvaspathsjs">trunk/PerformanceTests/Animometer/tests/simple/resources/simple-canvas-paths.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestssimpleresourcestiledcanvasimagejs">trunk/PerformanceTests/Animometer/tests/simple/resources/tiled-canvas-image.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometerteststemplateresourcestemplatecanvasjs">trunk/PerformanceTests/Animometer/tests/template/resources/template-canvas.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometerteststemplateresourcestemplatecssjs">trunk/PerformanceTests/Animometer/tests/template/resources/template-css.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometerteststemplateresourcestemplatesvgjs">trunk/PerformanceTests/Animometer/tests/template/resources/template-svg.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometerteststextresourceslayeringtextjs">trunk/PerformanceTests/Animometer/tests/text/resources/layering-text.js</a></li>
<li><a href="#trunkPerformanceTestsChangeLog">trunk/PerformanceTests/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingcanvasimagesjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-canvas-images.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-canvas-images.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-canvas-images.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -22,10 +22,10 @@
</span><span class="cx"> BouncingCanvasParticlesStage.call(this);
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- BouncingCanvasParticlesStage.prototype.initialize.call(this, benchmark);
- var imageSrc = benchmark.options["imageSrc"] || "resources/yin-yang.svg";
</del><ins>+ BouncingCanvasParticlesStage.prototype.initialize.call(this, benchmark, options);
+ var imageSrc = options["imageSrc"] || "resources/yin-yang.svg";
</ins><span class="cx"> this.imageElement = document.querySelector(".hidden[src=\"" + imageSrc + "\"]");
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingcanvasparticlesjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-canvas-particles.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-canvas-particles.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-canvas-particles.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -72,9 +72,9 @@
</span><span class="cx"> BouncingParticlesStage.call(this);
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- BouncingParticlesStage.prototype.initialize.call(this, benchmark);
</del><ins>+ BouncingParticlesStage.prototype.initialize.call(this, benchmark, options);
</ins><span class="cx"> this.context = this.element.getContext("2d");
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingcanvasshapesjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-canvas-shapes.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-canvas-shapes.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-canvas-shapes.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -63,10 +63,10 @@
</span><span class="cx"> BouncingCanvasParticlesStage.call(this);
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- BouncingCanvasParticlesStage.prototype.initialize.call(this, benchmark);
- this.parseShapeParameters(benchmark.options);
</del><ins>+ BouncingCanvasParticlesStage.prototype.initialize.call(this, benchmark, options);
+ this.parseShapeParameters(options);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> createParticle: function()
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingcssimagesjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-css-images.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-css-images.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-css-images.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -32,10 +32,10 @@
</span><span class="cx"> BouncingParticlesStage.call(this);
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- BouncingParticlesStage.prototype.initialize.call(this, benchmark);
- this.imageSrc = benchmark.options["imageSrc"] || "../resources/yin-yang.svg";
</del><ins>+ BouncingParticlesStage.prototype.initialize.call(this, benchmark, options);
+ this.imageSrc = options["imageSrc"] || "../resources/yin-yang.svg";
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> createParticle: function()
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingcssshapesjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-css-shapes.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-css-shapes.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-css-shapes.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -50,10 +50,10 @@
</span><span class="cx"> BouncingParticlesStage.call(this);
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- BouncingParticlesStage.prototype.initialize.call(this, benchmark);
- this.parseShapeParameters(benchmark.options);
</del><ins>+ BouncingParticlesStage.prototype.initialize.call(this, benchmark, options);
+ this.parseShapeParameters(options);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> createParticle: function()
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingparticlesjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-particles.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-particles.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-particles.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -72,11 +72,11 @@
</span><span class="cx"> this.particles = [];
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- Stage.prototype.initialize.call(this, benchmark);
- this.particleSize = new Point(parseInt(benchmark.options["particleWidth"]) || 10, parseInt(benchmark.options["particleHeight"]) || 10);
- this.maxVelocity = Math.max(parseInt(benchmark.options["maxVelocity"]) || 500, 100);
</del><ins>+ Stage.prototype.initialize.call(this, benchmark, options);
+ this.particleSize = new Point(parseInt(options["particleWidth"]) || 10, parseInt(options["particleHeight"]) || 10);
+ this.maxVelocity = Math.max(parseInt(options["maxVelocity"]) || 500, 100);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> parseShapeParameters: function(options)
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingsvgimagesjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-svg-images.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-svg-images.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-svg-images.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -18,10 +18,10 @@
</span><span class="cx"> BouncingSvgParticlesStage.call(this);
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- BouncingSvgParticlesStage.prototype.initialize.call(this, benchmark);
- this.imageSrc = benchmark.options["imageSrc"] || "resources/yin-yang.svg";
</del><ins>+ BouncingSvgParticlesStage.prototype.initialize.call(this, benchmark, options);
+ this.imageSrc = options["imageSrc"] || "resources/yin-yang.svg";
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> createParticle: function()
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingsvgshapesjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-svg-shapes.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-svg-shapes.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-svg-shapes.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -51,10 +51,10 @@
</span><span class="cx"> BouncingSvgParticlesStage.call(this);
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- BouncingSvgParticlesStage.prototype.initialize.call(this, benchmark);
- this.parseShapeParameters(benchmark.options);
</del><ins>+ BouncingSvgParticlesStage.prototype.initialize.call(this, benchmark, options);
+ this.parseShapeParameters(options);
</ins><span class="cx"> this._gradientsCount = 0;
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsmasterresourcescanvasstagejs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/master/resources/canvas-stage.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/master/resources/canvas-stage.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/master/resources/canvas-stage.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -6,9 +6,9 @@
</span><span class="cx"> this.objects = [];
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- Stage.prototype.initialize.call(this, benchmark);
</del><ins>+ Stage.prototype.initialize.call(this, benchmark, options);
</ins><span class="cx"> this.context = this.element.getContext("2d");
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsmasterresourcescanvastestsjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/master/resources/canvas-tests.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/master/resources/canvas-tests.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/master/resources/canvas-tests.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -127,10 +127,10 @@
</span><span class="cx"> SimpleCanvasStage.call(this, CanvasLineSegment);
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- SimpleCanvasStage.prototype.initialize.call(this, benchmark);
- this.context.lineCap = benchmark.options["lineCap"] || "butt";
</del><ins>+ SimpleCanvasStage.prototype.initialize.call(this, benchmark, options);
+ this.context.lineCap = options["lineCap"] || "butt";
</ins><span class="cx"> this.circleRadius = this.size.x / 3 / 2 - 20;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -162,11 +162,11 @@
</span><span class="cx"> SimpleCanvasStage.call(this, CanvasLinePoint);
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- SimpleCanvasStage.prototype.initialize.call(this, benchmark);
- this.context.lineJoin = benchmark.options["lineJoin"] || "bevel";
- this.context.lineCap = benchmark.options["lineCap"] || "butt";
</del><ins>+ SimpleCanvasStage.prototype.initialize.call(this, benchmark, options);
+ this.context.lineJoin = options["lineJoin"] || "bevel";
+ this.context.lineCap = options["lineCap"] || "butt";
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> animate: function() {
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsmasterresourcesparticlesjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/master/resources/particles.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/master/resources/particles.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/master/resources/particles.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -78,9 +78,9 @@
</span><span class="cx"> this.particles = [];
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- Stage.prototype.initialize.call(this, benchmark);
</del><ins>+ Stage.prototype.initialize.call(this, benchmark, options);
</ins><span class="cx"> this.emissionSpin = Stage.random(0, 3);
</span><span class="cx"> this.emitSteps = Stage.randomInt(4, 6);
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsmiscresourcescanvaselectronsjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/misc/resources/canvas-electrons.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/misc/resources/canvas-electrons.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/misc/resources/canvas-electrons.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -61,9 +61,9 @@
</span><span class="cx"> this._electrons = [];
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- Stage.prototype.initialize.call(this, benchmark);
</del><ins>+ Stage.prototype.initialize.call(this, benchmark, options);
</ins><span class="cx"> this.context = this.element.getContext("2d");
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsmiscresourcescanvasstarsjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/misc/resources/canvas-stars.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/misc/resources/canvas-stars.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/misc/resources/canvas-stars.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -58,9 +58,9 @@
</span><span class="cx"> this._objects = [];
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- Stage.prototype.initialize.call(this, benchmark);
</del><ins>+ Stage.prototype.initialize.call(this, benchmark, options);
</ins><span class="cx"> this.context = this.element.getContext("2d");
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsmiscresourcescompositingtransformsjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/misc/resources/compositing-transforms.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/misc/resources/compositing-transforms.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/misc/resources/compositing-transforms.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -35,12 +35,12 @@
</span><span class="cx"> BouncingParticlesStage.call(this);
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- BouncingParticlesStage.prototype.initialize.call(this, benchmark);
</del><ins>+ BouncingParticlesStage.prototype.initialize.call(this, benchmark, options);
</ins><span class="cx">
</span><del>- this.imageSrc = benchmark.options["imageSrc"] || "../resources/yin-yang.svg";
- this.useFilters = benchmark.options["filters"] == "yes";
</del><ins>+ this.imageSrc = options["imageSrc"] || "../resources/yin-yang.svg";
+ this.useFilters = options["filters"] == "yes";
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> createParticle: function()
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsresourcesmainjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/resources/main.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/resources/main.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/resources/main.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -1,14 +1,13 @@
</span><del>-
</del><span class="cx"> Controller = Utilities.createClass(
</span><del>- function(testLength, benchmark, seriesCount)
</del><ins>+ function(testLength, benchmark, options)
</ins><span class="cx"> {
</span><span class="cx"> // Initialize timestamps relative to the start of the benchmark
</span><span class="cx"> // In start() the timestamps are offset by the start timestamp
</span><span class="cx"> this._startTimestamp = 0;
</span><span class="cx"> this._endTimestamp = testLength;
</span><span class="cx"> // Default data series: timestamp, complexity, estimatedFrameLength
</span><del>- this._sampler = new Sampler(seriesCount || 3, 60 * testLength, this);
- this._estimator = new SimpleKalmanEstimator(benchmark.options["kalman-process-error"], benchmark.options["kalman-measurement-error"]);
</del><ins>+ this._sampler = new Sampler(options["series-count"] || 3, 60 * testLength, this);
+ this._estimator = new SimpleKalmanEstimator(options["kalman-process-error"], options["kalman-measurement-error"]);
</ins><span class="cx">
</span><span class="cx"> this.initialComplexity = 0;
</span><span class="cx"> }, {
</span><span class="lines">@@ -101,23 +100,23 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> FixedComplexityController = Utilities.createSubclass(Controller,
</span><del>- function(testInterval, benchmark)
</del><ins>+ function(testInterval, benchmark, options)
</ins><span class="cx"> {
</span><del>- Controller.call(this, testInterval, benchmark);
- this.initialComplexity = benchmark.options["complexity"];
</del><ins>+ Controller.call(this, testInterval, benchmark, options);
+ this.initialComplexity = options["complexity"];
</ins><span class="cx"> }
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> AdaptiveController = Utilities.createSubclass(Controller,
</span><del>- function(testInterval, benchmark)
</del><ins>+ function(testInterval, benchmark, options)
</ins><span class="cx"> {
</span><span class="cx"> // Data series: timestamp, complexity, estimatedIntervalFrameLength
</span><del>- Controller.call(this, testInterval, benchmark);
</del><ins>+ Controller.call(this, testInterval, benchmark, options);
</ins><span class="cx">
</span><span class="cx"> // All tests start at 0, so we expect to see 60 fps quickly.
</span><span class="cx"> this._samplingTimestamp = testInterval / 2;
</span><span class="cx"> this._startedSampling = false;
</span><del>- this._targetFrameRate = benchmark.options["frame-rate"];
</del><ins>+ this._targetFrameRate = options["frame-rate"];
</ins><span class="cx"> this._pid = new PIDController(this._targetFrameRate);
</span><span class="cx">
</span><span class="cx"> this._intervalFrameCount = 0;
</span><span class="lines">@@ -311,30 +310,24 @@
</span><span class="cx"> Benchmark = Utilities.createClass(
</span><span class="cx"> function(stage, options)
</span><span class="cx"> {
</span><del>- this._options = options;
</del><span class="cx"> this._animateLoop = this._animateLoop.bind(this);
</span><span class="cx">
</span><span class="cx"> this._stage = stage;
</span><del>- this._stage.initialize(this);
</del><ins>+ this._stage.initialize(this, options);
</ins><span class="cx">
</span><span class="cx"> var testIntervalMilliseconds = options["test-interval"] * 1000;
</span><span class="cx"> switch (options["adjustment"])
</span><span class="cx"> {
</span><span class="cx"> case "fixed":
</span><del>- this._controller = new FixedComplexityController(testIntervalMilliseconds, this);
</del><ins>+ this._controller = new FixedComplexityController(testIntervalMilliseconds, this, options);
</ins><span class="cx"> break;
</span><span class="cx"> case "adaptive":
</span><span class="cx"> default:
</span><del>- this._controller = new AdaptiveController(testIntervalMilliseconds, this);
</del><ins>+ this._controller = new AdaptiveController(testIntervalMilliseconds, this, options);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- get options()
- {
- return this._options;
- },
-
</del><span class="cx"> get stage()
</span><span class="cx"> {
</span><span class="cx"> return this._stage;
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestssimpleresourcessimplecanvaspathsjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/simple/resources/simple-canvas-paths.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/simple/resources/simple-canvas-paths.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/simple/resources/simple-canvas-paths.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -256,10 +256,10 @@
</span><span class="cx"> SimpleCanvasStage.call(this, CanvasLineSegment);
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- SimpleCanvasStage.prototype.initialize.call(this, benchmark);
- this.context.lineCap = benchmark.options["lineCap"] || "butt";
</del><ins>+ SimpleCanvasStage.prototype.initialize.call(this, benchmark, options);
+ this.context.lineCap = options["lineCap"] || "butt";
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -269,10 +269,10 @@
</span><span class="cx"> SimpleCanvasPathStrokeStage.call(this, CanvasLinePoint);
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- SimpleCanvasPathStrokeStage.prototype.initialize.call(this, benchmark);
- this.context.lineJoin = benchmark.options["lineJoin"] || "bevel";
</del><ins>+ SimpleCanvasPathStrokeStage.prototype.initialize.call(this, benchmark, options);
+ this.context.lineJoin = options["lineJoin"] || "bevel";
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -283,9 +283,9 @@
</span><span class="cx"> this._step = 0;
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- SimpleCanvasStage.prototype.initialize.call(this, benchmark);
</del><ins>+ SimpleCanvasStage.prototype.initialize.call(this, benchmark, options);
</ins><span class="cx"> this.context.setLineDash([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
</span><span class="cx"> this.context.lineWidth = 1;
</span><span class="cx"> this.context.strokeStyle = "#000";
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestssimpleresourcestiledcanvasimagejs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/simple/resources/tiled-canvas-image.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/simple/resources/tiled-canvas-image.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/simple/resources/tiled-canvas-image.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -25,9 +25,9 @@
</span><span class="cx"> Stage.call(this);
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- Stage.prototype.initialize.call(this, benchmark);
</del><ins>+ Stage.prototype.initialize.call(this, benchmark, options);
</ins><span class="cx"> this.context = this.element.getContext("2d");
</span><span class="cx"> this._setupTiles();
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerteststemplateresourcestemplatecanvasjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/template/resources/template-canvas.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/template/resources/template-canvas.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/template/resources/template-canvas.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -32,9 +32,9 @@
</span><span class="cx"> Stage.call(this);
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- Stage.prototype.initialize.call(this, benchmark);
</del><ins>+ Stage.prototype.initialize.call(this, benchmark, options);
</ins><span class="cx"> this.context = this.element.getContext("2d");
</span><span class="cx">
</span><span class="cx"> // Define a collection for your objects.
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerteststemplateresourcestemplatecssjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/template/resources/template-css.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/template/resources/template-css.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/template/resources/template-css.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -6,9 +6,9 @@
</span><span class="cx"> Stage.call(this);
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- Stage.prototype.initialize.call(this, benchmark);
</del><ins>+ Stage.prototype.initialize.call(this, benchmark, options);
</ins><span class="cx">
</span><span class="cx"> // Do initialization here.
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerteststemplateresourcestemplatesvgjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/template/resources/template-svg.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/template/resources/template-svg.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/template/resources/template-svg.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -6,9 +6,9 @@
</span><span class="cx"> Stage.call(this);
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- Stage.prototype.initialize.call(this, benchmark);
</del><ins>+ Stage.prototype.initialize.call(this, benchmark, options);
</ins><span class="cx">
</span><span class="cx"> // Do initialization here.
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerteststextresourceslayeringtextjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/text/resources/layering-text.js (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/text/resources/layering-text.js 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/Animometer/tests/text/resources/layering-text.js 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -6,9 +6,9 @@
</span><span class="cx"> Stage.call(this);
</span><span class="cx"> }, {
</span><span class="cx">
</span><del>- initialize: function(benchmark)
</del><ins>+ initialize: function(benchmark, options)
</ins><span class="cx"> {
</span><del>- Stage.prototype.initialize.call(this, benchmark);
</del><ins>+ Stage.prototype.initialize.call(this, benchmark, options);
</ins><span class="cx"> this._textElementParent = this.element;
</span><span class="cx"> this._textElements = [];
</span><span class="cx"> this._textItemIndex = 0;
</span></span></pre></div>
<a id="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (196288 => 196289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog 2016-02-09 03:25:39 UTC (rev 196288)
+++ trunk/PerformanceTests/ChangeLog 2016-02-09 03:30:18 UTC (rev 196289)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2016-02-07 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><ins>+ Get rid of options member variable in Benchmark.
+
+ Options are only needed when initializing the stage or benchmark, so there's no
+ need to also keep a reference to it.
+
+ * Animometer/tests/resources/main.js: Get rid of options variable in Benchmark.
+ Pass options to Controllers and Stages.
+ (Controller.Utilities.createClass):
+ (Benchmark.Utilities.createClass):
+ (get options): Deleted.
+
+ * Animometer/tests/bouncing-particles/resources/bouncing-canvas-images.js:
+ * Animometer/tests/bouncing-particles/resources/bouncing-canvas-particles.js:
+ * Animometer/tests/bouncing-particles/resources/bouncing-canvas-shapes.js:
+ * Animometer/tests/bouncing-particles/resources/bouncing-css-images.js:
+ * Animometer/tests/bouncing-particles/resources/bouncing-css-shapes.js:
+ * Animometer/tests/bouncing-particles/resources/bouncing-particles.js:
+ * Animometer/tests/bouncing-particles/resources/bouncing-svg-images.js:
+ * Animometer/tests/bouncing-particles/resources/bouncing-svg-shapes.js:
+ * Animometer/tests/master/resources/canvas-stage.js:
+ * Animometer/tests/master/resources/canvas-tests.js:
+ * Animometer/tests/master/resources/particles.js:
+ * Animometer/tests/misc/resources/canvas-electrons.js:
+ * Animometer/tests/misc/resources/canvas-stars.js:
+ * Animometer/tests/misc/resources/compositing-transforms.js:
+ * Animometer/tests/simple/resources/simple-canvas-paths.js:
+ * Animometer/tests/simple/resources/tiled-canvas-image.js:
+ * Animometer/tests/template/resources/template-canvas.js:
+ * Animometer/tests/template/resources/template-css.js:
+ * Animometer/tests/template/resources/template-svg.js:
+ * Animometer/tests/text/resources/layering-text.js:
+
+2016-02-07 Jon Lee <jonlee@apple.com>
+
</ins><span class="cx"> Update how the benchmark is run
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153960
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>