<!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>[192491] 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/192491">192491</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-16 15:22:16 -0800 (Mon, 16 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean referencing the options object in the graphics benchmark
https://bugs.webkit.org/show_bug.cgi?id=151284
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2015-11-16
Reviewed by Simon Fraser.
Get rid of the Benchmark.options member and rely only on the private member
Benchmark._options. The animator need to have its own options member instead
of accessing it from its reference to Benchmark object.
* Animometer/tests/bouncing-particles/resources/bouncing-canvas-particles.js:
(BouncingCanvasParticlesAnimator):
(BouncingCanvasParticlesBenchmark.prototype.createAnimator):
* Animometer/tests/bouncing-particles/resources/bouncing-particles.js:
(BouncingParticle.prototype.animate):
(BouncingParticlesAnimator):
(BouncingParticlesBenchmark.prototype.createAnimator):
* Animometer/tests/examples/resources/canvas-electrons.js:
(CanvasElectronsStage.prototype.animate):
(CanvasElectronsAnimator):
(CanvasElectronsBenchmark.prototype.createAnimator):
(window.benchmarkClient.create):
* Animometer/tests/examples/resources/canvas-stars.js:
(CanvasStarsStage.prototype.animate):
(CanvasStarsAnimator):
(CanvasStarsBenchmark.prototype.createAnimator):
(window.benchmarkClient.create):
* Animometer/tests/resources/main.js:
(BenchmarkState.prototype.currentProgress):
(Animator):
(Animator.prototype.animate):
(Benchmark):
(Benchmark.prototype.update):
* Animometer/tests/resources/stage.js:
(Stage.prototype.clear):
(StageAnimator):
(StageBenchmark.prototype.createAnimator):
(StageBenchmark.prototype.tune):
(StageBenchmark.prototype.showResults):
* Animometer/tests/simple/resources/simple-canvas.js:
(SimpleCanvasStage.prototype.animate):
(SimpleCanvasAnimator):
(SimpleCanvasAnimator.prototype.animate):
(SimpleCanvasBenchmark.prototype.createAnimator):
* Animometer/tests/template/resources/template-canvas.js:
(TemplateCanvasStage.prototype.animate):
(TemplateCanvasBenchmark.prototype.createAnimator):
(window.benchmarkClient.create):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingcanvasparticlesjs">trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-canvas-particles.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingparticlesjs">trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-particles.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsexamplesresourcescanvaselectronsjs">trunk/PerformanceTests/Animometer/tests/examples/resources/canvas-electrons.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsexamplesresourcescanvasstarsjs">trunk/PerformanceTests/Animometer/tests/examples/resources/canvas-stars.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsresourcesmainjs">trunk/PerformanceTests/Animometer/tests/resources/main.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsresourcesstagejs">trunk/PerformanceTests/Animometer/tests/resources/stage.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestssimpleresourcessimplecanvasjs">trunk/PerformanceTests/Animometer/tests/simple/resources/simple-canvas.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometerteststemplateresourcestemplatecanvasjs">trunk/PerformanceTests/Animometer/tests/template/resources/template-canvas.js</a></li>
<li><a href="#trunkPerformanceTestsChangeLog">trunk/PerformanceTests/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingcanvasparticlesjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-canvas-particles.js (192490 => 192491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-canvas-particles.js 2015-11-16 23:17:46 UTC (rev 192490)
+++ trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-canvas-particles.js 2015-11-16 23:22:16 UTC (rev 192491)
</span><span class="lines">@@ -76,9 +76,9 @@
</span><span class="cx"> BouncingCanvasParticlesStage.prototype = Object.create(BouncingParticlesStage.prototype);
</span><span class="cx"> BouncingCanvasParticlesStage.prototype.constructor = BouncingCanvasParticlesStage;
</span><span class="cx">
</span><del>-function BouncingCanvasParticlesAnimator(benchmark)
</del><ins>+function BouncingCanvasParticlesAnimator(benchmark, options)
</ins><span class="cx"> {
</span><del>- BouncingParticlesAnimator.call(this, benchmark);
</del><ins>+ BouncingParticlesAnimator.call(this, benchmark, options);
</ins><span class="cx"> this._context = benchmark._stage.context;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -101,5 +101,5 @@
</span><span class="cx">
</span><span class="cx"> BouncingCanvasParticlesBenchmark.prototype.createAnimator = function()
</span><span class="cx"> {
</span><del>- return new BouncingCanvasParticlesAnimator(this);
</del><ins>+ return new BouncingCanvasParticlesAnimator(this, this._options);
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsbouncingparticlesresourcesbouncingparticlesjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-particles.js (192490 => 192491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-particles.js 2015-11-16 23:17:46 UTC (rev 192490)
+++ trunk/PerformanceTests/Animometer/tests/bouncing-particles/resources/bouncing-particles.js 2015-11-16 23:22:16 UTC (rev 192491)
</span><span class="lines">@@ -57,9 +57,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function BouncingParticlesAnimator(benchmark)
</del><ins>+function BouncingParticlesAnimator(benchmark, options)
</ins><span class="cx"> {
</span><del>- StageAnimator.call(this, benchmark);
</del><ins>+ StageAnimator.call(this, benchmark, options);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> BouncingParticlesAnimator.prototype = Object.create(StageAnimator.prototype);
</span><span class="lines">@@ -126,5 +126,5 @@
</span><span class="cx">
</span><span class="cx"> BouncingParticlesBenchmark.prototype.createAnimator = function()
</span><span class="cx"> {
</span><del>- return new BouncingParticlesAnimator(this);
</del><ins>+ return new BouncingParticlesAnimator(this, this._options);
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsexamplesresourcescanvaselectronsjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/examples/resources/canvas-electrons.js (192490 => 192491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/examples/resources/canvas-electrons.js 2015-11-16 23:17:46 UTC (rev 192490)
+++ trunk/PerformanceTests/Animometer/tests/examples/resources/canvas-electrons.js 2015-11-16 23:22:16 UTC (rev 192491)
</span><span class="lines">@@ -82,9 +82,9 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function CanvasElectronsAnimator(benchmark)
</del><ins>+function CanvasElectronsAnimator(benchmark, options)
</ins><span class="cx"> {
</span><del>- Animator.call(this, benchmark);
</del><ins>+ Animator.call(this, benchmark, options);
</ins><span class="cx"> this._context = benchmark._stage.context;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> CanvasElectronsBenchmark.prototype.createAnimator = function()
</span><span class="cx"> {
</span><span class="cx"> // Attach the animator to the benchmark.
</span><del>- return new CanvasElectronsAnimator(this);
</del><ins>+ return new CanvasElectronsAnimator(this, this._options);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> window.benchmarkClient.create = function(suite, test, options, recordTable, progressBar)
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsexamplesresourcescanvasstarsjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/examples/resources/canvas-stars.js (192490 => 192491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/examples/resources/canvas-stars.js 2015-11-16 23:17:46 UTC (rev 192490)
+++ trunk/PerformanceTests/Animometer/tests/examples/resources/canvas-stars.js 2015-11-16 23:22:16 UTC (rev 192491)
</span><span class="lines">@@ -83,9 +83,9 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function CanvasStarsAnimator(benchmark)
</del><ins>+function CanvasStarsAnimator(benchmark, options)
</ins><span class="cx"> {
</span><del>- Animator.call(this, benchmark);
</del><ins>+ Animator.call(this, benchmark, options);
</ins><span class="cx"> this._context = benchmark._stage.context;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> CanvasStarsBenchmark.prototype.createAnimator = function()
</span><span class="cx"> {
</span><span class="cx"> // Attach the animator to the benchmark.
</span><del>- return new CanvasStarsAnimator(this);
</del><ins>+ return new CanvasStarsAnimator(this, this._options);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> window.benchmarkClient.create = function(suite, test, options, recordTable, progressBar)
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsresourcesmainjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/resources/main.js (192490 => 192491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/resources/main.js 2015-11-16 23:17:46 UTC (rev 192490)
+++ trunk/PerformanceTests/Animometer/tests/resources/main.js 2015-11-16 23:22:16 UTC (rev 192491)
</span><span class="lines">@@ -59,9 +59,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function Animator(benchmark)
</del><ins>+function Animator(benchmark, options)
</ins><span class="cx"> {
</span><span class="cx"> this._benchmark = benchmark;
</span><ins>+ this._options = options;
+
</ins><span class="cx"> this._frameCount = 0;
</span><span class="cx"> this._dropFrameCount = 1;
</span><span class="cx"> this._measureFrameCount = 3;
</span><span class="lines">@@ -109,7 +111,7 @@
</span><span class="cx"> var currentFrameRate = Math.floor(1000 / (measureTimeDelta / this._measureFrameCount));
</span><span class="cx">
</span><span class="cx"> // Use Kalman filter to get a more non-fluctuating frame rate.
</span><del>- if (this._benchmark.options["estimated-frame-rate"])
</del><ins>+ if (this._options["estimated-frame-rate"])
</ins><span class="cx"> currentFrameRate = this._estimator.estimate(currentFrameRate);
</span><span class="cx">
</span><span class="cx"> // Adjust the test to reach the desired FPS.
</span><span class="lines">@@ -138,7 +140,6 @@
</span><span class="cx"> this._options = options;
</span><span class="cx"> this._method = this._options["method"] || "requestAnimationFrame";
</span><span class="cx">
</span><del>- this.options = options;
</del><span class="cx"> this._recordInterval = 200;
</span><span class="cx"> this._isSampling = false;
</span><span class="cx">
</span><span class="lines">@@ -148,7 +149,7 @@
</span><span class="cx">
</span><span class="cx"> this._controller = new PIDController(gain, options["frame-rate"], lowValue, highValue);
</span><span class="cx"> this._sampler = new Sampler(2);
</span><del>- this._state = new BenchmarkState(this.options["test-interval"] * 1000);
</del><ins>+ this._state = new BenchmarkState(this._options["test-interval"] * 1000);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Benchmark.prototype =
</span><span class="lines">@@ -179,11 +180,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var tuneValue = 0;
</span><del>- if (this.options["complexity"] && !this.options["adaptive-test"]) {
</del><ins>+ if (this._options["complexity"] && !this._options["adaptive-test"]) {
</ins><span class="cx"> // this.tune(0) returns the current complexity of the test.
</span><del>- tuneValue = this.options["complexity"] - this.tune(0);
</del><ins>+ tuneValue = this._options["complexity"] - this.tune(0);
</ins><span class="cx"> }
</span><del>- else if (!(this._isSampling && this.options["fix-test-complexity"])) {
</del><ins>+ else if (!(this._isSampling && this._options["fix-test-complexity"])) {
</ins><span class="cx"> // The relationship between frameRate and test complexity is inverse-proportional so we
</span><span class="cx"> // need to use the negative of PIDController.tune() to change the complexity of the test.
</span><span class="cx"> tuneValue = -this._controller.tune(currentFrameRate, timeDelta / 1000);
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsresourcesstagejs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/resources/stage.js (192490 => 192491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/resources/stage.js 2015-11-16 23:17:46 UTC (rev 192490)
+++ trunk/PerformanceTests/Animometer/tests/resources/stage.js 2015-11-16 23:22:16 UTC (rev 192491)
</span><span class="lines">@@ -112,9 +112,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function StageAnimator(benchmark)
</del><ins>+function StageAnimator(benchmark, options)
</ins><span class="cx"> {
</span><del>- Animator.call(this, benchmark);
</del><ins>+ Animator.call(this, benchmark, options);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> StageAnimator.prototype = Object.create(Animator.prototype);
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx">
</span><span class="cx"> StageBenchmark.prototype.createAnimator = function()
</span><span class="cx"> {
</span><del>- return new StageAnimator(this);
</del><ins>+ return new StageAnimator(this, this._options);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StageBenchmark.prototype.tune = function(count)
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> if (!this._recordTable || !this._progressBar || !this._test)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (this.options["show-running-results"])
</del><ins>+ if (this._options["show-running-results"])
</ins><span class="cx"> this._recordTable.showRecord(this._test.name, message, this._sampler.toJSON(true, false));
</span><span class="cx">
</span><span class="cx"> this._progressBar.setPos(progress);
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestssimpleresourcessimplecanvasjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/simple/resources/simple-canvas.js (192490 => 192491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/simple/resources/simple-canvas.js 2015-11-16 23:17:46 UTC (rev 192490)
+++ trunk/PerformanceTests/Animometer/tests/simple/resources/simple-canvas.js 2015-11-16 23:22:16 UTC (rev 192491)
</span><span class="lines">@@ -36,9 +36,9 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function SimpleCanvasAnimator(benchmark)
</del><ins>+function SimpleCanvasAnimator(benchmark, options)
</ins><span class="cx"> {
</span><del>- StageAnimator.call(this, benchmark);
</del><ins>+ StageAnimator.call(this, benchmark, options);
</ins><span class="cx"> this._context = benchmark._stage.context;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> SimpleCanvasAnimator.prototype.animate = function()
</span><span class="cx"> {
</span><span class="cx"> this._context.clearRect(0, 0, this._benchmark._stage.size.x, this._benchmark._stage.size.y);
</span><del>- return StageAnimator.prototype.animate.call(this);
</del><ins>+ return StageAnimator.prototype.animate.call(this, this._options);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -60,6 +60,6 @@
</span><span class="cx"> SimpleCanvasBenchmark.prototype = Object.create(StageBenchmark.prototype);
</span><span class="cx"> SimpleCanvasBenchmark.prototype.constructor = SimpleCanvasBenchmark;
</span><span class="cx"> SimpleCanvasBenchmark.prototype.createAnimator = function() {
</span><del>- return new SimpleCanvasAnimator(this);
</del><ins>+ return new SimpleCanvasAnimator(this, this._options);
</ins><span class="cx"> }
</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 (192490 => 192491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/template/resources/template-canvas.js 2015-11-16 23:17:46 UTC (rev 192490)
+++ trunk/PerformanceTests/Animometer/tests/template/resources/template-canvas.js 2015-11-16 23:22:16 UTC (rev 192491)
</span><span class="lines">@@ -57,9 +57,9 @@
</span><span class="cx"> // Loop through all your objects and ask them to animate.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function TemplateCanvasAnimator(benchmark)
</del><ins>+function TemplateCanvasAnimator(benchmark, options)
</ins><span class="cx"> {
</span><del>- Animator.call(this, benchmark);
</del><ins>+ Animator.call(this, benchmark, options);
</ins><span class="cx"> this._context = benchmark._stage.context;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> TemplateCanvasBenchmark.prototype.createAnimator = function()
</span><span class="cx"> {
</span><span class="cx"> // Attach the animator to the benchmark.
</span><del>- return new TemplateCanvasAnimator(this);
</del><ins>+ return new TemplateCanvasAnimator(this, this._options);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> window.benchmarkClient.create = function(suite, test, options, recordTable, progressBar)
</span></span></pre></div>
<a id="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (192490 => 192491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog 2015-11-16 23:17:46 UTC (rev 192490)
+++ trunk/PerformanceTests/ChangeLog 2015-11-16 23:22:16 UTC (rev 192491)
</span><span class="lines">@@ -1,3 +1,53 @@
</span><ins>+2015-11-16 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Clean referencing the options object in the graphics benchmark
+ https://bugs.webkit.org/show_bug.cgi?id=151284
+
+ Reviewed by Simon Fraser.
+
+ Get rid of the Benchmark.options member and rely only on the private member
+ Benchmark._options. The animator need to have its own options member instead
+ of accessing it from its reference to Benchmark object.
+
+ * Animometer/tests/bouncing-particles/resources/bouncing-canvas-particles.js:
+ (BouncingCanvasParticlesAnimator):
+ (BouncingCanvasParticlesBenchmark.prototype.createAnimator):
+ * Animometer/tests/bouncing-particles/resources/bouncing-particles.js:
+ (BouncingParticle.prototype.animate):
+ (BouncingParticlesAnimator):
+ (BouncingParticlesBenchmark.prototype.createAnimator):
+ * Animometer/tests/examples/resources/canvas-electrons.js:
+ (CanvasElectronsStage.prototype.animate):
+ (CanvasElectronsAnimator):
+ (CanvasElectronsBenchmark.prototype.createAnimator):
+ (window.benchmarkClient.create):
+ * Animometer/tests/examples/resources/canvas-stars.js:
+ (CanvasStarsStage.prototype.animate):
+ (CanvasStarsAnimator):
+ (CanvasStarsBenchmark.prototype.createAnimator):
+ (window.benchmarkClient.create):
+ * Animometer/tests/resources/main.js:
+ (BenchmarkState.prototype.currentProgress):
+ (Animator):
+ (Animator.prototype.animate):
+ (Benchmark):
+ (Benchmark.prototype.update):
+ * Animometer/tests/resources/stage.js:
+ (Stage.prototype.clear):
+ (StageAnimator):
+ (StageBenchmark.prototype.createAnimator):
+ (StageBenchmark.prototype.tune):
+ (StageBenchmark.prototype.showResults):
+ * Animometer/tests/simple/resources/simple-canvas.js:
+ (SimpleCanvasStage.prototype.animate):
+ (SimpleCanvasAnimator):
+ (SimpleCanvasAnimator.prototype.animate):
+ (SimpleCanvasBenchmark.prototype.createAnimator):
+ * Animometer/tests/template/resources/template-canvas.js:
+ (TemplateCanvasStage.prototype.animate):
+ (TemplateCanvasBenchmark.prototype.createAnimator):
+ (window.benchmarkClient.create):
+
</ins><span class="cx"> 2015-11-13 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Eliminate a request for layout every time an item is added to the stage of the graphics benchmark
</span></span></pre>
</div>
</div>
</body>
</html>