Convert Benchmark to a JS class

Author: smfr

MotionMark/tests/3d/resources/webgl.js

@@ -193,11 +193,11 @@ class WebGLStage extends Stage {
     }
 }
 
-WebGLBenchmark = Utilities.createSubclass(Benchmark,
-    function(options)
+class WebGLBenchmark extends Benchmark {
+    constructor(options)
     {
-        Benchmark.call(this, new WebGLStage(), options);
+        super(new WebGLStage(), options);
     }
-);
+}
 
 window.benchmarkClass = WebGLBenchmark;

MotionMark/tests/3d/resources/webgpu.js

@@ -65,7 +65,7 @@ fragment float4 fragmentMain(float4 inColor : attribute(1)) : SV_Target 0 {
 }
 `;
 
-class WebGLStage extends Stage
+class WebGLStage extends Stage {
     constructor(element, options)
     {
         super();
@@ -314,16 +314,17 @@ class WebGLStage extends Stage
     }
 }
 
-WebGLBenchmark = Utilities.createSubclass(Benchmark,
-    function(options)
+class WebGLBenchmark extends Benchmark {
+    constructor(options)
     {
-        Benchmark.call(this, new WebGLStage(), options);
-    }, {
+        super(new WebGLStage(), options);
+    }
 
-    waitUntilReady: function() {
+    waitUntilReady()
+    {
         this._initPromise = new SimplePromise;
         return this._initPromise;
-    },
-});
+    }
+}
 
 window.benchmarkClass = WebGLBenchmark;

MotionMark/tests/bouncing-particles/resources/bouncing-canvas-images.js

@@ -58,11 +58,11 @@ class BouncingCanvasImagesStage extends BouncingCanvasParticlesStage {
     }
 }
 
-BouncingCanvasImagesBenchmark = Utilities.createSubclass(Benchmark,
-    function(options)
+class BouncingCanvasImagesBenchmark extends Benchmark {
+    constructor(options)
     {
-        Benchmark.call(this, new BouncingCanvasImagesStage(), options);
+        super(new BouncingCanvasImagesStage(), options);
     }
-);
+}
 
 window.benchmarkClass = BouncingCanvasImagesBenchmark;

MotionMark/tests/bouncing-particles/resources/bouncing-canvas-shapes.js

@@ -98,11 +98,11 @@ class BouncingCanvasShapesStage extends BouncingCanvasParticlesStage {
     }
 }
 
-BouncingCanvasShapesBenchmark = Utilities.createSubclass(Benchmark,
-    function(options)
+class BouncingCanvasShapesBenchmark extends Benchmark {
+    constructor(options)
     {
-        Benchmark.call(this, new BouncingCanvasShapesStage(), options);
+        super(new BouncingCanvasShapesStage(), options);
     }
-);
+}
 
 window.benchmarkClass = BouncingCanvasShapesBenchmark;

MotionMark/tests/bouncing-particles/resources/bouncing-css-images.js

@@ -72,11 +72,11 @@ class BouncingCssImagesStage extends BouncingParticlesStage {
     }
 }
 
-BouncingCssImagesBenchmark = Utilities.createSubclass(Benchmark,
-    function(options)
+class BouncingCssImagesBenchmark extends Benchmark {
+    constructor(options)
     {
-        Benchmark.call(this, new BouncingCssImagesStage(), options);
+        super(new BouncingCssImagesStage(), options);
     }
-);
+}
 
 window.benchmarkClass = BouncingCssImagesBenchmark;

MotionMark/tests/bouncing-particles/resources/bouncing-css-shapes.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-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,7 +22,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-(function() {
 
 BouncingCssShape = Utilities.createSubclass(BouncingParticle,
     function(stage)
@@ -98,13 +97,11 @@ class BouncingCssShapesStage extends BouncingParticlesStage {
     }
 }
 
-BouncingCssShapesBenchmark = Utilities.createSubclass(Benchmark,
-    function(options)
+class BouncingCssShapesBenchmark extends Benchmark {
+    constructor(options)
     {
-        Benchmark.call(this, new BouncingCssShapesStage(), options);
+        super(new BouncingCssShapesStage(), options);
     }
-);
+}
 
 window.benchmarkClass = BouncingCssShapesBenchmark;
-
-})();

MotionMark/tests/bouncing-particles/resources/bouncing-svg-images.js

@@ -53,11 +53,11 @@ class BouncingSvgImagesStage extends BouncingSvgParticlesStage {
     }
 }
 
-BouncingSvgImagesBenchmark = Utilities.createSubclass(Benchmark,
-    function(options)
+class BouncingSvgImagesBenchmark extends Benchmark {
+    constructor(options)
     {
-        Benchmark.call(this, new BouncingSvgImagesStage(), options);
+        super(new BouncingSvgImagesStage(), options);
     }
-);
+}
 
 window.benchmarkClass = BouncingSvgImagesBenchmark;

MotionMark/tests/bouncing-particles/resources/bouncing-svg-shapes.js

@@ -112,11 +112,11 @@ class BouncingSvgShapesStage extends BouncingSvgParticlesStage {
     }
 }
 
-BouncingSvgShapesBenchmark = Utilities.createSubclass(Benchmark,
-    function(options)
+class BouncingSvgShapesBenchmark extends Benchmark {
+    constructor(options)
     {
-        Benchmark.call(this, new BouncingSvgShapesStage(), options);
+        super(new BouncingSvgShapesStage(), options);
     }
-);
+}
 
 window.benchmarkClass = BouncingSvgShapesBenchmark;

MotionMark/tests/bouncing-particles/resources/bouncing-tagged-images.js

@@ -112,16 +112,17 @@ class BouncingTaggedImagesStage extends BouncingParticlesStage {
     }
 }
 
-BouncingTaggedImagesBenchmark = Utilities.createSubclass(Benchmark,
-    function(options)
+class BouncingTaggedImagesBenchmark extends Benchmark {
+    constructor(options)
     {
-        Benchmark.call(this, new BouncingTaggedImagesStage(), options);
-    }, {
+        super(new BouncingTaggedImagesStage(), options);
+    }
 
-    waitUntilReady: function() {
+    waitUntilReady()
+    {
         this.readyPromise = new SimplePromise;
         return this.readyPromise;
     }
-});
+}
 
 window.benchmarkClass = BouncingTaggedImagesBenchmark;

MotionMark/tests/core/resources/canvas-tests.js

@@ -310,8 +310,8 @@ class CanvasLinePathStage extends SimpleCanvasStage {
 
 // === BENCHMARK ===
 
-CanvasPathBenchmark = Utilities.createSubclass(Benchmark,
-    function(options)
+class CanvasPathBenchmark extends Benchmark {
+    constructor(options)
     {
         var stage;
         switch (options["pathType"]) {
@@ -326,8 +326,8 @@ CanvasPathBenchmark = Utilities.createSubclass(Benchmark,
             break;
         }
 
-        Benchmark.call(this, stage, options);
+        super(stage, options);
     }
-);
+}
 
 window.benchmarkClass = CanvasPathBenchmark;