Convert benchmark-runner.js to JS class syntax.

Author: smfr

MotionMark/resources/runner/benchmark-runner.js

@@ -1,29 +1,54 @@
-BenchmarkRunnerState = Utilities.createClass(
-    function(suites)
+/*
+ * Copyright (C) 2015-2020 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+class BenchmarkRunnerState {
+    constructor(suites)
     {
         this._suites = suites;
         this._suiteIndex = -1;
         this._testIndex = 0;
         this.next();
-    }, {
+    }
 
-    currentSuite: function()
+    currentSuite()
     {
         return this._suites[this._suiteIndex];
-    },
+    }
 
-    currentTest: function()
+    currentTest()
     {
         var suite = this.currentSuite();
         return suite ? suite.tests[this._testIndex] : null;
-    },
+    }
 
-    isFirstTest: function()
+    isFirstTest()
     {
         return !this._testIndex;
-    },
+    }
 
-    next: function()
+    next()
     {
         this._testIndex++;
 
@@ -35,9 +60,9 @@ BenchmarkRunnerState = Utilities.createClass(
         do {
             this._suiteIndex++;
         } while (this._suiteIndex < this._suites.length && this._suites[this._suiteIndex].disabled);
-    },
+    }
 
-    prepareCurrentTest: function(runner, frame)
+    prepareCurrentTest(runner, frame)
     {
         var test = this.currentTest();
         var promise = new SimplePromise;
@@ -49,35 +74,35 @@ BenchmarkRunnerState = Utilities.createClass(
         frame.src = "tests/" + test.url;
         return promise;
     }
-});
+}
 
-BenchmarkRunner = Utilities.createClass(
-    function(suites, frameContainer, client)
+class BenchmarkRunner {
+    constructor(suites, frameContainer, client)
     {
         this._suites = suites;
         this._client = client;
         this._frameContainer = frameContainer;
-    }, {
+    }
 
-    _appendFrame: function()
+    _appendFrame()
     {
         var frame = document.createElement("iframe");
         frame.setAttribute("scrolling", "no");
 
         this._frameContainer.insertBefore(frame, this._frameContainer.firstChild);
         this._frame = frame;
         return frame;
-    },
+    }
 
-    _removeFrame: function()
+    _removeFrame()
     {
         if (this._frame) {
             this._frame.parentNode.removeChild(this._frame);
             this._frame = null;
         }
-    },
+    }
 
-    _runBenchmarkAndRecordResults: function(state)
+    _runBenchmarkAndRecordResults(state)
     {
         var promise = new SimplePromise;
         var suite = state.currentSuite();
@@ -110,9 +135,9 @@ BenchmarkRunner = Utilities.createClass(
         });
 
         return promise;
-    },
+    }
 
-    step: function(state)
+    step(state)
     {
         if (!state) {
             state = new BenchmarkRunnerState(this._suites);
@@ -134,18 +159,18 @@ BenchmarkRunner = Utilities.createClass(
         return state.prepareCurrentTest(this, this._frame).then(function(prepareReturnValue) {
             return this._runBenchmarkAndRecordResults(state);
         }.bind(this));
-    },
+    }
 
-    runAllSteps: function(startingState)
+    runAllSteps(startingState)
     {
         var nextCallee = this.runAllSteps.bind(this);
         this.step(startingState).then(function(nextState) {
             if (nextState)
                 nextCallee(nextState);
         });
-    },
+    }
 
-    runMultipleIterations: function()
+    runMultipleIterations()
     {
         var self = this;
         var currentIteration = 0;
@@ -164,9 +189,9 @@ BenchmarkRunner = Utilities.createClass(
             this._client.willStartFirstIteration();
 
         this.runAllSteps();
-    },
+    }
 
-    _finalize: function()
+    _finalize()
     {
         this._removeFrame();
 
@@ -176,4 +201,4 @@ BenchmarkRunner = Utilities.createClass(
         if (this._runNextIteration)
             this._runNextIteration();
     }
-});
+}