<!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>[202317] 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/202317">202317</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2016-06-21 20:26:24 -0700 (Tue, 21 Jun 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add new timestamp option
https://bugs.webkit.org/show_bug.cgi?id=159006

Reviewed by Dean Jackson.

Add a new option to take timestamps from the rAF callback.

* Animometer/developer.html: Added option.
* Animometer/tests/resources/main.js:
(Benchmark): Fall back to using the rAF timestamp if performance.now()
is not available.
(Benchmark._animateLoop): Update how timestamp is set. Prefer to use
local var instead of accessing private var.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsAnimometerdeveloperhtml">trunk/PerformanceTests/Animometer/developer.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsresourcesmainjs">trunk/PerformanceTests/Animometer/tests/resources/main.js</a></li>
<li><a href="#trunkPerformanceTestsChangeLog">trunk/PerformanceTests/ChangeLog</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkPerformanceTestsAnimometerdeveloperhtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/developer.html (202316 => 202317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/developer.html        2016-06-22 03:16:14 UTC (rev 202316)
+++ trunk/PerformanceTests/Animometer/developer.html        2016-06-22 03:26:24 UTC (rev 202317)
</span><span class="lines">@@ -70,7 +70,8 @@
</span><span class="cx">                                 &lt;li&gt;
</span><span class="cx">                                     &lt;h3&gt;Time measurement method:&lt;/h3&gt;
</span><span class="cx">                                     &lt;ul&gt;
</span><del>-                                        &lt;li&gt;&lt;label&gt;&lt;input name=&quot;time-measurement&quot; type=&quot;radio&quot; value=&quot;performance&quot; checked&gt; &lt;code&gt;performance.now()&lt;/code&gt;&lt;/label&gt;&lt;/li&gt;
</del><ins>+                                        &lt;li&gt;&lt;label&gt;&lt;input name=&quot;time-measurement&quot; type=&quot;radio&quot; value=&quot;performance&quot; checked&gt; &lt;code&gt;performance.now()&lt;/code&gt; (if available)&lt;/label&gt;&lt;/li&gt;
+                                        &lt;li&gt;&lt;label&gt;&lt;input name=&quot;time-measurement&quot; type=&quot;radio&quot; value=&quot;raf&quot;&gt; &lt;code&gt;requestAnimationFrame()&lt;/code&gt; timestamp&lt;/label&gt;&lt;/li&gt;
</ins><span class="cx">                                         &lt;li&gt;&lt;label&gt;&lt;input name=&quot;time-measurement&quot; type=&quot;radio&quot; value=&quot;date&quot;&gt; &lt;code&gt;Date.now()&lt;/code&gt;&lt;/label&gt;&lt;/li&gt;
</span><span class="cx">                                     &lt;/ul&gt;
</span><span class="cx">                                 &lt;/li&gt;
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsresourcesmainjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/resources/main.js (202316 => 202317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/resources/main.js        2016-06-22 03:16:14 UTC (rev 202316)
+++ trunk/PerformanceTests/Animometer/tests/resources/main.js        2016-06-22 03:26:24 UTC (rev 202317)
</span><span class="lines">@@ -832,8 +832,14 @@
</span><span class="cx">         switch (options[&quot;time-measurement&quot;])
</span><span class="cx">         {
</span><span class="cx">         case &quot;performance&quot;:
</span><del>-            this._getTimestamp = performance.now.bind(performance);
</del><ins>+            if (window.performance &amp;&amp; window.performance.now)
+                this._getTimestamp = performance.now.bind(performance);
+            else
+                this._getTimestamp = null;
</ins><span class="cx">             break;
</span><ins>+        case &quot;raf&quot;:
+            this._getTimestamp = null;
+            break;
</ins><span class="cx">         case &quot;date&quot;:
</span><span class="cx">             this._getTimestamp = Date.now;
</span><span class="cx">             break;
</span><span class="lines">@@ -879,7 +885,7 @@
</span><span class="cx">     {
</span><span class="cx">         return this.waitUntilReady().then(function() {
</span><span class="cx">             this._finishPromise = new SimplePromise;
</span><del>-            this._previousTimestamp = this._getTimestamp();
</del><ins>+            this._previousTimestamp = undefined;
</ins><span class="cx">             this._didWarmUp = false;
</span><span class="cx">             this._stage.tune(this._controller.initialComplexity - this._stage.complexity());
</span><span class="cx">             this._animateLoop();
</span><span class="lines">@@ -895,21 +901,24 @@
</span><span class="cx">         return promise;
</span><span class="cx">     },
</span><span class="cx"> 
</span><del>-    _animateLoop: function()
</del><ins>+    _animateLoop: function(timestamp)
</ins><span class="cx">     {
</span><del>-        this._currentTimestamp = this._getTimestamp();
</del><ins>+        timestamp = (this._getTimestamp &amp;&amp; this._getTimestamp()) || timestamp;
+        this._currentTimestamp = timestamp;
</ins><span class="cx"> 
</span><del>-        if (this._controller.shouldStop(this._currentTimestamp)) {
</del><ins>+        if (this._controller.shouldStop(timestamp)) {
</ins><span class="cx">             this._finishPromise.resolve(this._controller.results());
</span><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if (!this._didWarmUp) {
</span><del>-            if (this._currentTimestamp - this._previousTimestamp &gt;= 100) {
</del><ins>+            if (!this._previousTimestamp)
+                this._previousTimestamp = timestamp;
+            else if (timestamp - this._previousTimestamp &gt;= 100) {
</ins><span class="cx">                 this._didWarmUp = true;
</span><del>-                this._startTimestamp = this._currentTimestamp;
-                this._controller.start(this._currentTimestamp, this._stage);
-                this._previousTimestamp = this._currentTimestamp;
</del><ins>+                this._startTimestamp = timestamp;
+                this._controller.start(timestamp, this._stage);
+                this._previousTimestamp = timestamp;
</ins><span class="cx">             }
</span><span class="cx"> 
</span><span class="cx">             this._stage.animate(0);
</span><span class="lines">@@ -917,9 +926,9 @@
</span><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        this._controller.update(this._currentTimestamp, this._stage);
-        this._stage.animate(this._currentTimestamp - this._previousTimestamp);
-        this._previousTimestamp = this._currentTimestamp;
</del><ins>+        this._controller.update(timestamp, this._stage);
+        this._stage.animate(timestamp - this._previousTimestamp);
+        this._previousTimestamp = timestamp;
</ins><span class="cx">         requestAnimationFrame(this._animateLoop);
</span><span class="cx">     }
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (202316 => 202317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog        2016-06-22 03:16:14 UTC (rev 202316)
+++ trunk/PerformanceTests/ChangeLog        2016-06-22 03:26:24 UTC (rev 202317)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-06-21  Jon Lee  &lt;jonlee@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Add new timestamp option
+        https://bugs.webkit.org/show_bug.cgi?id=159006
+
+        Reviewed by Dean Jackson.
+
+        Add a new option to take timestamps from the rAF callback.
+
+        * Animometer/developer.html: Added option.
+        * Animometer/tests/resources/main.js:
+        (Benchmark): Fall back to using the rAF timestamp if performance.now()
+        is not available.
+        (Benchmark._animateLoop): Update how timestamp is set. Prefer to use
+        local var instead of accessing private var.
+
+2016-06-21  Jon Lee  &lt;jonlee@apple.com&gt;
+
</ins><span class="cx">         Improvements to Animometer benchmark
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=157738
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>