<!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>[210566] trunk/Tools</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/210566">210566</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-10 15:45:22 -0800 (Tue, 10 Jan 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Temporarily add back the file removed in <a href="http://trac.webkit.org/projects/webkit/changeset/210463">r210463</a> to unbreak internal bots.

* Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch: Copied from Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerdatapatchesAnimometerpatch">trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (210565 => 210566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2017-01-10 23:41:55 UTC (rev 210565)
+++ trunk/Tools/ChangeLog        2017-01-10 23:45:22 UTC (rev 210566)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+2017-01-10  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
+
+        Temporarily add back the file removed in r210463 to unbreak internal bots.
+
+        * Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch: Copied from Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch.
+
</ins><span class="cx"> 2017-01-10  Jonathan Bedard  &lt;jbedard@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         svn-apply failed to apply a patch (deleting file with svn property)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdatapatchesAnimometerpatchfromrev210462trunkToolsScriptswebkitpybenchmark_runnerdatapatchesAnimometerpatch"></a>
<div class="copfile"><h4>Copied: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch (from rev 210462, trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch) (0 => 210566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch                                (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch        2017-01-10 23:45:22 UTC (rev 210566)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+diff --git a/resources/runner/animometer.js b/resources/runner/animometer.js
+index b20a1c9..e434e89 100644
+--- a/resources/runner/animometer.js
++++ b/resources/runner/animometer.js
+@@ -320,6 +320,61 @@ window.benchmarkRunnerClient = {
+     didFinishLastIteration: function()
+     {
+         benchmarkController.showResults();
++    },
++
++    _computeTestReport: function(testName, testResults)
++    {
++        return [testResults[Strings.json.score]];
++    },
++
++    _computeSuiteReports: function(suiteName, suiteResults)
++    {
++        var testsReports = {};
++        for (var testName in suiteResults) {
++            var testReports = this._computeTestReport(testName, suiteResults[testName]);
++            testsReports[testName] = { &quot;metrics&quot;: { &quot;Score&quot;: { &quot;current&quot;: testReports } } };
++        }
++        return testsReports;
++    },
++
++    _computeIterationReports: function(iterationResults)
++    {
++        var suitesReports = {};
++        for (var suiteName in iterationResults[Strings.json.results.tests]) {
++            var testsReports = this._computeSuiteReports(suiteName, iterationResults[Strings.json.results.tests][suiteName]);
++            suitesReports[suiteName] = { &quot;metrics&quot;: { &quot;Score&quot;: [&quot;Geometric&quot;] }, &quot;tests&quot;: testsReports };
++        }
++        return suitesReports;
++    },
++
++    _computeResultsReports: function()
++    {
++        var results = this.results.results[0];
++        var iterationReports = this._computeIterationReports(results);
++        var debugOutput = {
++            options: benchmarkRunnerClient.results.options,
++            data: benchmarkRunnerClient.results.data,
++        }
++        return {&quot;Animometer&quot;: {&quot;metrics&quot; : {&quot;Score&quot; : [&quot;Geometric&quot;]}, &quot;tests&quot; : iterationReports }, &quot;debugOutput&quot;: debugOutput};
++    },
++
++    didFinishLastIteration: function()
++    {
++        // submit result to server
++        var results = JSON.stringify(this._computeResultsReports());
++        var xhr = new XMLHttpRequest();
++        xhr.open(&quot;POST&quot;, &quot;/report&quot;);
++        xhr.setRequestHeader(&quot;Content-type&quot;, &quot;application/json&quot;);
++        xhr.setRequestHeader(&quot;Content-length&quot;, results.length);
++        xhr.setRequestHeader(&quot;Connection&quot;, &quot;close&quot;);
++        xhr.onreadystatechange = function() {
++            if (xhr.readyState == XMLHttpRequest.DONE &amp;&amp; xhr.status == 200) {
++                closeRequest = new XMLHttpRequest();
++                closeRequest.open(&quot;GET&quot;, &quot;/shutdown&quot;);
++                closeRequest.send()
++            }
++        }
++        xhr.send(results);
+     }
+ };
+
+@@ -357,7 +408,7 @@ window.sectionsManager =
+ window.benchmarkController = {
+     initialize: function()
+     {
+-        benchmarkController.addOrientationListenerIfNecessary();
++        setTimeout(benchmarkController.startBenchmark.bind(benchmarkController), 3000);
+     },
+
+     addOrientationListenerIfNecessary: function() {
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdatapatchesAnimometerpatch"></a>
<div class="propset"><h4>Property changes: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<ins>+/trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch:53455
</ins><span class="cx">\ No newline at end of property
</span></div>

</body>
</html>