<!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>[194743] 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/194743">194743</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2016-01-07 16:10:01 -0800 (Thu, 07 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a waitUntilReady() step
https://bugs.webkit.org/show_bug.cgi?id=152862
Reviewed by Simon Fraser.
Add a waitUntilReady() callback that lets the benchmark complete
its setup before running the benchmark.
* Animometer/tests/resources/main.js:
(Benchmark.prototype.run): First call waitUntilReady, which returns
a promise. When the promise resolves, run everything that was in this
function.
(Benchmark.prototype.waitUntilReady): Default implementation returns
a resolved promise.
(Benchmark.prototype.resolveWhenFinished): Deleted.
* Animometer/tests/template/resources/template-canvas.js:
(new.TemplateCanvasStage.waitUntilReady): Example on how to override.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsAnimometerresourcesdebugrunneranimometerjs">trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsresourcesmainjs">trunk/PerformanceTests/Animometer/tests/resources/main.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="trunkPerformanceTestsAnimometerresourcesdebugrunneranimometerjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.js (194742 => 194743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.js 2016-01-08 00:08:58 UTC (rev 194742)
+++ trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.js 2016-01-08 00:10:01 UTC (rev 194743)
</span><span class="lines">@@ -76,7 +76,9 @@
</span><span class="cx"> else if (type == "radio")
</span><span class="cx"> options[name] = formElements[name].value;
</span><span class="cx">
</span><del>- localStorage.setItem(name, options[name]);
</del><ins>+ try {
+ localStorage.setItem(name, options[name]);
+ } catch (e) {}
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return options;
</span><span class="lines">@@ -278,7 +280,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var value = { checked: testCheckbox.checked, complexity: testEdit.value };
</span><del>- localStorage.setItem(this._localStorageNameForTest(suite.name, test.name), JSON.stringify(value));
</del><ins>+ try {
+ localStorage.setItem(this._localStorageNameForTest(suite.name, test.name), JSON.stringify(value));
+ } catch (e) {}
</ins><span class="cx"> }, this);
</span><span class="cx">
</span><span class="cx"> if (tests.length)
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsresourcesmainjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/resources/main.js (194742 => 194743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/resources/main.js 2016-01-08 00:08:58 UTC (rev 194742)
+++ trunk/PerformanceTests/Animometer/tests/resources/main.js 2016-01-08 00:10:01 UTC (rev 194743)
</span><span class="lines">@@ -350,17 +350,24 @@
</span><span class="cx">
</span><span class="cx"> run: function()
</span><span class="cx"> {
</span><del>- this.start();
</del><ins>+ return this.waitUntilReady().then(function() {
+ this.start();
+ var promise = new SimplePromise;
+ var resolveWhenFinished = function() {
+ if (typeof this._state != "undefined" && (this._state.currentStage() == BenchmarkState.stages.FINISHED))
+ return promise.resolve(this._sampler);
+ setTimeout(resolveWhenFinished, 50);
+ }.bind(this);
</ins><span class="cx">
</span><ins>+ resolveWhenFinished();
+ return promise;
+ }.bind(this));
+ },
+
+ waitUntilReady: function()
+ {
</ins><span class="cx"> var promise = new SimplePromise;
</span><del>- var self = this;
- function resolveWhenFinished() {
- if (typeof self._state != "undefined" && (self._state.currentStage() == BenchmarkState.stages.FINISHED))
- return promise.resolve(self._sampler);
- setTimeout(resolveWhenFinished.bind(self), 50);
- }
-
- resolveWhenFinished();
</del><ins>+ promise.resolve();
</ins><span class="cx"> return promise;
</span><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 (194742 => 194743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/template/resources/template-canvas.js 2016-01-08 00:08:58 UTC (rev 194742)
+++ trunk/PerformanceTests/Animometer/tests/template/resources/template-canvas.js 2016-01-08 00:10:01 UTC (rev 194743)
</span><span class="lines">@@ -72,8 +72,23 @@
</span><span class="cx"> function(options)
</span><span class="cx"> {
</span><span class="cx"> Benchmark.call(this, new TemplateCanvasStage(), options);
</span><ins>+ }, {
+
+ // Override this function if the benchmark needs to wait for resources to be
+ // loaded.
+ //
+ // Default implementation returns a resolved promise, so that the benchmark
+ // benchmark starts right away. Here's an example where we're waiting 5
+ // seconds before starting the benchmark.
+ waitUntilReady: function()
+ {
+ var promise = new SimplePromise;
+ window.setTimeout(function() {
+ promise.resolve();
+ }, 5000);
+ return promise;
</ins><span class="cx"> }
</span><del>-);
</del><ins>+});
</ins><span class="cx">
</span><span class="cx"> window.benchmarkClass = TemplateCanvasBenchmark;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (194742 => 194743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog 2016-01-08 00:08:58 UTC (rev 194742)
+++ trunk/PerformanceTests/ChangeLog 2016-01-08 00:10:01 UTC (rev 194743)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-01-07 Jon Lee <jonlee@apple.com>
+
+ Add a waitUntilReady() step
+ https://bugs.webkit.org/show_bug.cgi?id=152862
+
+ Reviewed by Simon Fraser.
+
+ Add a waitUntilReady() callback that lets the benchmark complete
+ its setup before running the benchmark.
+
+ * Animometer/tests/resources/main.js:
+ (Benchmark.prototype.run): First call waitUntilReady, which returns
+ a promise. When the promise resolves, run everything that was in this
+ function.
+ (Benchmark.prototype.waitUntilReady): Default implementation returns
+ a resolved promise.
+ (Benchmark.prototype.resolveWhenFinished): Deleted.
+ * Animometer/tests/template/resources/template-canvas.js:
+ (new.TemplateCanvasStage.waitUntilReady): Example on how to override.
+
</ins><span class="cx"> 2016-01-03 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Update data reporting and analysis
</span></span></pre>
</div>
</div>
</body>
</html>