"Reverting 18531"

tests/benchmark_smoke/benchmark_base.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of benchmark_lib;
 
 /** Accessors for our Singleton variables. */
 BenchmarkSuite get BENCHMARK_SUITE {
   if (BenchmarkSuite._ONLY == null) {
     BenchmarkSuite._ONLY = new BenchmarkSuite._internal();
@@ skipping 76 matching lines @@
     Map<String, int> normalizingDict = {'Smoketest': 100};
     score = score / normalizingDict[name];
     BENCHMARK_SUITE.updateIndividualScore(name, score);
   }
 }
 
 /** The controller class that runs all of the benchmarks. */
 class BenchmarkSuite {
   /** The set of benchmarks that have yet to run. */
   List<Function> benchmarks;
-
+  
   /**
    * The set of scores from the benchmarks that have already run. (Used for
    * calculating the Geometric mean).
    */
   List<num> scores;
 
   /** The total number of benchmarks we will be running. */
   int totalBenchmarks;
 
   /** Singleton pattern: There's only one BenchmarkSuite. */
   static BenchmarkSuite _ONLY = null;
 
   BenchmarkSuite._internal() {
     scores = [];
     benchmarks = [() => Smoketest.main()];
     totalBenchmarks = benchmarks.length;
   }
-
+  
   /** Run all of the benchmarks that we have in our benchmarks list. */
   runBenchmarks() {
     runBenchmarksHelper(benchmarks);
   }
-
+ 
    /**
    * Run the remaining benchmarks in our list. We chain the calls providing
-   * little breaks for the main page to gain control, so we don't force the
+   * little breaks for the main page to gain control, so we don't force the 
    * entire page to hang the whole time.
    */
   runBenchmarksHelper(List<Function> remainingBenchmarks) {
     // Remove the last benchmark, and run it.
     var benchmark = remainingBenchmarks.removeLast();
     benchmark();
     if (remainingBenchmarks.length > 0) {
-      /* Provide small breaks between each benchmark, so that the browser
+      /* Provide small breaks between each benchmark, so that the browser 
       doesn't get unhappy about long running scripts, and so the user
       can regain control of the UI to kill the page as needed. */
-      new Timer(const Duration(milliseconds: 25),
-          () => runBenchmarksHelper(remainingBenchmarks));
+      window.setTimeout(() => runBenchmarksHelper(remainingBenchmarks), 25);
     } else if (remainingBenchmarks.length == 0) {
       // We've run all of the benchmarks. Update the page with the score.
       BENCHMARK_VIEW.setScore(geometricMean(scores));
     }
   }
 
   /** Store the results of a single benchmark run. */
   updateIndividualScore(String name, num score) {
-    scores.add(score);
+    scores.add(score); 
     BENCHMARK_VIEW.incrementProgress(name, score, totalBenchmarks);
   }
 
   /** Computes the geometric mean of a set of numbers. */
   geometricMean(numbers) {
     num log = 0;
     for (num n in numbers) {
       log += Math.log(n);
     }
     return Math.pow(Math.E, log / numbers.length);
@@ skipping 11 matching lines @@
 
   BenchmarkView._internal();
 
   /** Update the page HTML to show the calculated score. */
   setScore(num score) {
     String newScore = formatScore(score * 100.0);
     Element body = document.queryAll("body")[0];
     body.nodes.add(
         new Element.html("<p id='testResultScore'>Score: $newScore</p>"));
   }
-
+ 
   /**
-   * Update the page HTML to show how much progress we've made through the
+   * Update the page HTML to show how much progress we've made through the 
    * benchmarks.
    */
   incrementProgress(String name, num score, num totalBenchmarks) {
     String newScore = formatScore(score * 100.0);
     numCompleted++;
     // Slightly incorrect (truncating) percentage, but this is just to show
     // the user we're making progress.
     num percentage = 100 * numCompleted ~/ totalBenchmarks;
   }
-
-  /**
+  
+  /** 
    * Rounds the score to have at least three significant digits (hopefully)
    * helping readability of the scores.
    */
   String formatScore(num value) {
     if (value > 100) {
       return value.toStringAsFixed(0);
     } else {
       return value.toStringAsFixed(2);
     }
   }
 }