Convert classes in motionmark.js and debug-runner.js to JS class syntax.

Author: smfr

MotionMark/resources/debug-runner/debug-runner.js

@@ -22,34 +22,35 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-ProgressBar = Utilities.createClass(
-    function(element, ranges)
+
+class ProgressBar {
+    constructor(element, ranges)
     {
         this._element = element;
         this._ranges = ranges;
         this._currentRange = 0;
         this._updateElement();
-    }, {
+    }
 
-    _updateElement: function()
+    _updateElement()
     {
         this._element.style.width = (this._currentRange * (100 / this._ranges)) + "%";
-    },
+    }
 
-    incrementRange: function()
+    incrementRange()
     {
         ++this._currentRange;
         this._updateElement();
     }
-});
+}
 
-DeveloperResultsTable = Utilities.createSubclass(ResultsTable,
-    function(element, headers)
+class DeveloperResultsTable extends ResultsTable {
+    constructor(element, headers)
     {
-        ResultsTable.call(this, element, headers);
-    }, {
+        super(element, headers);
+    }
 
-    _addGraphButton: function(td, testName, testResult, testData)
+    _addGraphButton(td, testName, testResult, testData)
     {
         var button = Utilities.createElement("button", { class: "small-button" }, td);
         button.textContent = Strings.text.graph + "…";
@@ -60,9 +61,9 @@ DeveloperResultsTable = Utilities.createSubclass(ResultsTable,
         button.addEventListener("click", function(e) {
             benchmarkController.showTestGraph(e.target.testName, e.target.testResult, e.target.testData);
         });
-    },
+    }
 
-    _isNoisyMeasurement: function(jsonExperiment, data, measurement, options)
+    _isNoisyMeasurement(jsonExperiment, data, measurement, options)
     {
         const percentThreshold = 10;
         const averageThreshold = 2;
@@ -74,9 +75,9 @@ DeveloperResultsTable = Utilities.createSubclass(ResultsTable,
             return Math.abs(data[Strings.json.measurements.average] - options["frame-rate"]) >= averageThreshold;
 
         return false;
-    },
+    }
 
-    _addTest: function(testName, testResult, options, testData)
+    _addTest(testName, testResult, options, testData)
     {
         var row = Utilities.createElement("tr", {}, this.element);
 
@@ -120,7 +121,7 @@ DeveloperResultsTable = Utilities.createSubclass(ResultsTable,
                 td.textContent = header.text(testResult);
         }, this);
     }
-});
+}
 
 Utilities.extendObject(window.benchmarkRunnerClient, {
     testsCount: null,

MotionMark/resources/runner/motionmark.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2018-2024 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -22,8 +22,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
- ResultsDashboard = Utilities.createClass(
-    function(version, options, testData)
+
+class ResultsDashboard {
+    constructor(version, options, testData)
     {
         this._iterationsSamplers = [];
         this._options = options;
@@ -35,14 +36,14 @@
             this._iterationsSamplers = testData;
             this._processData();
         }
-    }, {
+    }
 
-    push: function(suitesSamplers)
+    push(suitesSamplers)
     {
         this._iterationsSamplers.push(suitesSamplers);
-    },
+    }
 
-    _processData: function()
+    _processData()
     {
         this._results = {};
         this._results[Strings.json.results.iterations] = [];
@@ -89,9 +90,9 @@
         this._results[Strings.json.score] = Statistics.sampleMean(iterationsScores.length, iterationsScores.reduce(function(a, b) { return a + b; }));
         this._results[Strings.json.scoreLowerBound] = this._results[Strings.json.results.iterations][0][Strings.json.scoreLowerBound];
         this._results[Strings.json.scoreUpperBound] = this._results[Strings.json.results.iterations][0][Strings.json.scoreUpperBound];
-    },
+    }
 
-    calculateScore: function(data)
+    calculateScore(data)
     {
         var result = {};
         data[Strings.json.result] = result;
@@ -250,57 +251,57 @@
             result[Strings.json.scoreLowerBound] = result[Strings.json.score] - averageFrameLength.standardDeviation();
             result[Strings.json.scoreUpperBound] = result[Strings.json.score] + averageFrameLength.standardDeviation();
         }
-    },
+    }
 
     get data()
     {
         return this._iterationsSamplers;
-    },
+    }
 
     get results()
     {
         if (this._results)
             return this._results[Strings.json.results.iterations];
         this._processData();
         return this._results[Strings.json.results.iterations];
-    },
+    }
 
     get options()
     {
         return this._options;
-    },
+    }
 
     get version()
     {
         return this._version;
-    },
+    }
 
-    _getResultsProperty: function(property)
+    _getResultsProperty(property)
     {
         if (this._results)
             return this._results[property];
         this._processData();
         return this._results[property];
-    },
+    }
 
     get score()
     {
         return this._getResultsProperty(Strings.json.score);
-    },
+    }
 
     get scoreLowerBound()
     {
         return this._getResultsProperty(Strings.json.scoreLowerBound);
-    },
+    }
 
     get scoreUpperBound()
     {
         return this._getResultsProperty(Strings.json.scoreUpperBound);
     }
-});
+}
 
-ResultsTable = Utilities.createClass(
-    function(element, headers)
+class ResultsTable {
+    constructor(element, headers)
     {
         this.element = element;
         this._headers = headers;
@@ -321,14 +322,14 @@ ResultsTable = Utilities.createClass(
         });
 
         this.clear();
-    }, {
+    }
 
-    clear: function()
+    clear()
     {
         this.element.textContent = "";
-    },
+    }
 
-    _addHeader: function()
+    _addHeader()
     {
         var thead = Utilities.createElement("thead", {}, this.element);
         var row = Utilities.createElement("tr", {}, thead);
@@ -343,22 +344,22 @@ ResultsTable = Utilities.createClass(
             if (header.children)
                 th.colSpan = header.children.length;
         });
-    },
+    }
 
-    _addBody: function()
+    _addBody()
     {
         this.tbody = Utilities.createElement("tbody", {}, this.element);
-    },
+    }
 
-    _addEmptyRow: function()
+    _addEmptyRow()
     {
         var row = Utilities.createElement("tr", {}, this.tbody);
         this._flattenedHeaders.forEach(function (header) {
             return Utilities.createElement("td", { class: "suites-separator" }, row);
         });
-    },
+    }
 
-    _addTest: function(testName, testResult, options)
+    _addTest(testName, testResult, options)
     {
         var row = Utilities.createElement("tr", {}, this.tbody);
 
@@ -374,9 +375,9 @@ ResultsTable = Utilities.createClass(
             } else
                 td.innerHTML = header.text(testResult);
         }, this);
-    },
+    }
 
-    _addIteration: function(iterationResult, iterationData, options)
+    _addIteration(iterationResult, iterationData, options)
     {
         var testsResults = iterationResult[Strings.json.results.tests];
         for (var suiteName in testsResults) {
@@ -386,9 +387,9 @@ ResultsTable = Utilities.createClass(
             for (var testName in suiteResult)
                 this._addTest(testName, suiteResult[testName], options, suiteData[testName]);
         }
-    },
+    }
 
-    showIterations: function(dashboard)
+    showIterations(dashboard)
     {
         this.clear();
         this._addHeader();
@@ -399,7 +400,7 @@ ResultsTable = Utilities.createClass(
             this._addIteration(iterationResult, dashboard.data[index], dashboard.options);
         }, this);
     }
-});
+}
 
 window.benchmarkRunnerClient = {
     iterationCount: 1,