Modified: trunk/Tools/ChangeLog (210565 => 210566)
--- trunk/Tools/ChangeLog 2017-01-10 23:41:55 UTC (rev 210565)
+++ trunk/Tools/ChangeLog 2017-01-10 23:45:22 UTC (rev 210566)
@@ -1,3 +1,9 @@
+2017-01-10 Ryosuke Niwa <[email protected]>
+
+ 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.
+
2017-01-10 Jonathan Bedard <[email protected]>
svn-apply failed to apply a patch (deleting file with svn property)
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)
--- 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)
@@ -0,0 +1,75 @@
+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] = { "metrics": { "Score": { "current": 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] = { "metrics": { "Score": ["Geometric"] }, "tests": 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 {"Animometer": {"metrics" : {"Score" : ["Geometric"]}, "tests" : iterationReports }, "debugOutput": debugOutput};
++ },
++
++ didFinishLastIteration: function()
++ {
++ // submit result to server
++ var results = JSON.stringify(this._computeResultsReports());
++ var xhr = new XMLHttpRequest();
++ xhr.open("POST", "/report");
++ xhr.setRequestHeader("Content-type", "application/json");
++ xhr.setRequestHeader("Content-length", results.length);
++ xhr.setRequestHeader("Connection", "close");
++ xhr._onreadystatechange_ = function() {
++ if (xhr.readyState == XMLHttpRequest.DONE && xhr.status == 200) {
++ closeRequest = new XMLHttpRequest();
++ closeRequest.open("GET", "/shutdown");
++ 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() {
