Respond to review feedback:

smfr · smfr · commit f2408a9e2799 · 2024-09-13T11:38:31.000-07:00
* remove empty constructors
* fix TextStage static shadowFalloff initialization
* WebGPU test should use WebGPUStage and WebGPUBenchmark
* Whitespace
diff --git a/MotionMark/resources/extensions.js b/MotionMark/resources/extensions.js
@@ -298,12 +298,12 @@ class Point {
 
     length()
     {
-        return Math.sqrt( this.x * this.x + this.y * this.y );
+        return Math.sqrt(this.x * this.x + this.y * this.y);
     }
 
     normalize()
     {
-        var l = Math.sqrt( this.x * this.x + this.y * this.y );
+        var l = Math.sqrt(this.x * this.x + this.y * this.y);
         this.x /= l;
         this.y /= l;
         return this;
diff --git a/MotionMark/tests/3d/resources/webgl.js b/MotionMark/tests/3d/resources/webgl.js
@@ -24,11 +24,6 @@
  */
 
 class WebGLStage extends Stage {
-    constructor(element, options)
-    {
-        super();
-    }
-
     initialize(benchmark, options)
     {
         super.initialize(benchmark, options);
diff --git a/MotionMark/tests/3d/resources/webgpu.js b/MotionMark/tests/3d/resources/webgpu.js
@@ -65,8 +65,8 @@ fragment float4 fragmentMain(float4 inColor : attribute(1)) : SV_Target 0 {
 }
 `;
 
-class WebGLStage extends Stage {
-    constructor(element, options)
+class WebGPUStage extends Stage {
+    constructor()
     {
         super();
     }
@@ -314,10 +314,10 @@ class WebGLStage extends Stage {
     }
 }
 
-class WebGLBenchmark extends Benchmark {
+class WebGPUBenchmark extends Benchmark {
     constructor(options)
     {
-        super(new WebGLStage(), options);
+        super(new WebGPUStage(), options);
     }
 
     waitUntilReady()
@@ -327,4 +327,4 @@ class WebGLBenchmark extends Benchmark {
     }
 }
 
-window.benchmarkClass = WebGLBenchmark;
+window.benchmarkClass = WebGPUBenchmark;
diff --git a/MotionMark/tests/bouncing-particles/resources/bouncing-canvas-images.js b/MotionMark/tests/bouncing-particles/resources/bouncing-canvas-images.js
@@ -40,11 +40,6 @@ class BouncingCanvasImage extends BouncingCanvasParticle {
 }
 
 class BouncingCanvasImagesStage extends BouncingCanvasParticlesStage {
-    constructor()
-    {
-        super();
-    }
-
     initialize(benchmark, options)
     {
         super.initialize(benchmark, options);
diff --git a/MotionMark/tests/bouncing-particles/resources/bouncing-canvas-particles.js b/MotionMark/tests/bouncing-particles/resources/bouncing-canvas-particles.js
@@ -93,11 +93,6 @@ class BouncingCanvasParticle extends BouncingParticle {
 }
 
 class BouncingCanvasParticlesStage extends BouncingParticlesStage {
-    constructor()
-    {
-        super();
-    }
-
     initialize(benchmark, options)
     {
         super.initialize(benchmark, options);
diff --git a/MotionMark/tests/bouncing-particles/resources/bouncing-css-images.js b/MotionMark/tests/bouncing-particles/resources/bouncing-css-images.js
@@ -50,11 +50,6 @@ class BouncingCssImage extends BouncingParticle {
 }
 
 class BouncingCssImagesStage extends BouncingParticlesStage {
-    constructor()
-    {
-        super();
-    }
-
     initialize(benchmark, options)
     {
         super.initialize(benchmark, options);
diff --git a/MotionMark/tests/bouncing-particles/resources/bouncing-css-shapes.js b/MotionMark/tests/bouncing-particles/resources/bouncing-css-shapes.js
@@ -75,11 +75,6 @@ class BouncingCssShape extends BouncingParticle {
 }
 
 class BouncingCssShapesStage extends BouncingParticlesStage {
-    constructor()
-    {
-        super();
-    }
-
     initialize(benchmark, options)
     {
         super.initialize(benchmark, options);
diff --git a/MotionMark/tests/bouncing-particles/resources/bouncing-svg-images.js b/MotionMark/tests/bouncing-particles/resources/bouncing-svg-images.js
@@ -36,11 +36,6 @@ class BouncingSvgImage extends BouncingSvgParticle {
 )
 
 class BouncingSvgImagesStage extends BouncingSvgParticlesStage {
-    constructor()
-    {
-        super();
-    }
-
     initialize(benchmark, options)
     {
         super.initialize(benchmark, options);
diff --git a/MotionMark/tests/bouncing-particles/resources/bouncing-svg-particles.js b/MotionMark/tests/bouncing-particles/resources/bouncing-svg-particles.js
@@ -55,11 +55,6 @@ class BouncingSvgParticle extends BouncingParticle {
 }
 
 class BouncingSvgParticlesStage extends BouncingParticlesStage {
-    constructor()
-    {
-        super();
-    }
-
     _createDefs()
     {
         return Utilities.createSVGElement("defs", {}, {}, this.element);
diff --git a/MotionMark/tests/bouncing-particles/resources/bouncing-svg-shapes.js b/MotionMark/tests/bouncing-particles/resources/bouncing-svg-shapes.js
@@ -69,11 +69,6 @@ class BouncingSvgShape extends BouncingSvgParticle {
 }
 
 class BouncingSvgShapesStage extends BouncingSvgParticlesStage {
-    constructor()
-    {
-        super();
-    }
-
     initialize(benchmark, options)
     {
         super.initialize(benchmark, options);
diff --git a/MotionMark/tests/core/resources/design.js b/MotionMark/tests/core/resources/design.js
@@ -24,7 +24,7 @@
  */
 
 class TextStage extends Stage {
-    static shadowFalloff;
+    static shadowFalloff = new UnitBezier(new Point(0.015, 0.750), new Point(0.755, 0.235));
     static shimmerAverage = 0;
     static shimmerMax = 0.5;
     static millisecondsPerRotation = 1000 / (.26 * Math.PI * 2);
@@ -35,11 +35,9 @@ class TextStage extends Stage {
         [101, 100, 117, 80, 230, 175],
         [232, 165, 30, 69, 186, 172]
     ];
-    
+
     constructor()
     {
-        TextStage.shadowFalloff = new UnitBezier(new Point(0.015, 0.750), new Point(0.755, 0.235));
-        
         super();
 
         this.testElements = [];
diff --git a/MotionMark/tests/core/resources/focus.js b/MotionMark/tests/core/resources/focus.js
@@ -87,11 +87,6 @@ class FocusElement {
 }
 
 class FocusStage extends Stage {
-    constructor()
-    {
-        super();
-    }
-
     initialize(benchmark, options)
     {
         super.initialize(benchmark, options);
diff --git a/MotionMark/tests/core/resources/suits.js b/MotionMark/tests/core/resources/suits.js
@@ -98,11 +98,6 @@ class SuitsParticle extends Particle {
 }
 
 class SuitsStage extends ParticlesStage {
-    constructor()
-    {
-        super();
-    }
-
     initialize(benchmark)
     {
         super.initialize(benchmark);
diff --git a/MotionMark/tests/dom/resources/compositing-transforms.js b/MotionMark/tests/dom/resources/compositing-transforms.js
@@ -53,11 +53,6 @@ class BouncingCompositedImage extends BouncingParticle {
 }
 
 class CompositingTransformsStage extends BouncingParticlesStage {
-    constructor()
-    {
-        super();
-    }
-
     initialize(benchmark, options)
     {
         super.initialize(benchmark, options);
diff --git a/MotionMark/tests/dom/resources/dom-particles.js b/MotionMark/tests/dom/resources/dom-particles.js
@@ -59,11 +59,6 @@ class DOMParticle extends Particle {
 }
 
 class DOMParticleStage extends ParticlesStage {
-    constructor()
-    {
-        super();
-    }
-
     initialize(benchmark)
     {
         super.initialize(benchmark);
diff --git a/MotionMark/tests/dom/resources/focus.js b/MotionMark/tests/dom/resources/focus.js
@@ -92,11 +92,6 @@ class FocusStage extends Stage {
     static maxBlurValue = 15;
     static maxCenterObjectBlurValue = 5;
     
-    constructor()
-    {
-        super();
-    }
-
     initialize(benchmark, options)
     {
         super.initialize(benchmark, options);
diff --git a/MotionMark/tests/simple/resources/simple-canvas-paths.js b/MotionMark/tests/simple/resources/simple-canvas-paths.js
@@ -338,10 +338,6 @@ class CanvasFill {
 // === STAGES ===
 
 class SimpleCanvasPathStrokeStage extends SimpleCanvasStage {
-    constructor(canvasObject) {
-        super(canvasObject);
-    }
-
     animate()
     {
         var context = this.context;
@@ -357,10 +353,6 @@ class SimpleCanvasPathStrokeStage extends SimpleCanvasStage {
 }
 
 class SimpleCanvasPathFillStage extends SimpleCanvasStage {
-    constructor(canvasObject) {
-        super(canvasObject);
-    }
-
     animate()
     {
         var context = this.context;
diff --git a/MotionMark/tests/simple/resources/simple-canvas.js b/MotionMark/tests/simple/resources/simple-canvas.js
@@ -24,11 +24,6 @@
  */
 
 class SimpleCanvasStage extends CanvasStage {
-    constructor(canvasObject)
-    {
-        super(canvasObject)
-    }
-    
     tune(count)
     {
         if (count == 0)
diff --git a/MotionMark/tests/template/resources/template-canvas.js b/MotionMark/tests/template/resources/template-canvas.js
@@ -53,11 +53,6 @@ class TemplateCanvasObject
 }
 
 class TemplateCanvasStage extends Stage {
-    constructor()
-    {
-        super();
-    }
-
     initialize(benchmark, options)
     {
         super.initialize(benchmark, options);
diff --git a/MotionMark/tests/template/resources/template-css.js b/MotionMark/tests/template/resources/template-css.js
@@ -24,11 +24,6 @@
  */
 
 class TemplateCssStage extends Stage {
-    constructor()
-    {
-        super();
-    }
-
     initialize(benchmark, options)
     {
         super.initialize(benchmark, options);
diff --git a/MotionMark/tests/template/resources/template-svg.js b/MotionMark/tests/template/resources/template-svg.js
@@ -24,11 +24,6 @@
  */
 
 class TemplateSvgStage extends Stage {
-    constructor()
-    {
-        super();
-    }
-
     initialize(benchmark, options)
     {
         super.initialize(benchmark, options);

Original file line number	Diff line number	Diff line change
`@@ -298,12 +298,12 @@ class Point {`
`298`	`298`
`299`	`299`	`length()`
`300`	`300`	`{`
`301`		`- return Math.sqrt( this.x * this.x + this.y * this.y );`
	`301`	`+ return Math.sqrt(this.x * this.x + this.y * this.y);`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`normalize()`
`305`	`305`	`{`
`306`		`- var l = Math.sqrt( this.x * this.x + this.y * this.y );`
	`306`	`+ var l = Math.sqrt(this.x * this.x + this.y * this.y);`
`307`	`307`	`this.x /= l;`
`308`	`308`	`this.y /= l;`
`309`	`309`	`return this;`
Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,8 @@ fragment float4 fragmentMain(float4 inColor : attribute(1)) : SV_Target 0 {`
`65`	`65`	`}`
`66`	`66`	`;
`67`	`67`
`68`		`-class WebGLStage extends Stage {`
`69`		`- constructor(element, options)`
	`68`	`+class WebGPUStage extends Stage {`
	`69`	`+ constructor()`
`70`	`70`	`{`
`71`	`71`	`super();`
`72`	`72`	`}`
`@@ -314,10 +314,10 @@ class WebGLStage extends Stage {`
`314`	`314`	`}`
`315`	`315`	`}`
`316`	`316`
`317`		`-class WebGLBenchmark extends Benchmark {`
	`317`	`+class WebGPUBenchmark extends Benchmark {`
`318`	`318`	`constructor(options)`
`319`	`319`	`{`
`320`		`- super(new WebGLStage(), options);`
	`320`	`+ super(new WebGPUStage(), options);`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`waitUntilReady()`
`@@ -327,4 +327,4 @@ class WebGLBenchmark extends Benchmark {`
`327`	`327`	`}`
`328`	`328`	`}`
`329`	`329`
`330`		`-window.benchmarkClass = WebGLBenchmark;`
	`330`	`+window.benchmarkClass = WebGPUBenchmark;`
Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,6 @@ class BouncingCanvasImage extends BouncingCanvasParticle {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`class BouncingCanvasImagesStage extends BouncingCanvasParticlesStage {`
`43`		`- constructor()`
`44`		`- {`
`45`		`- super();`
`46`		`- }`
`47`		`-`
`48`	`43`	`initialize(benchmark, options)`
`49`	`44`	`{`
`50`	`45`	`super.initialize(benchmark, options);`
Original file line number	Diff line number	Diff line change
`@@ -93,11 +93,6 @@ class BouncingCanvasParticle extends BouncingParticle {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`class BouncingCanvasParticlesStage extends BouncingParticlesStage {`
`96`		`- constructor()`
`97`		`- {`
`98`		`- super();`
`99`		`- }`
`100`		`-`
`101`	`96`	`initialize(benchmark, options)`
`102`	`97`	`{`
`103`	`98`	`super.initialize(benchmark, options);`
Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,6 @@ class BouncingCssImage extends BouncingParticle {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`class BouncingCssImagesStage extends BouncingParticlesStage {`
`53`		`- constructor()`
`54`		`- {`
`55`		`- super();`
`56`		`- }`
`57`		`-`
`58`	`53`	`initialize(benchmark, options)`
`59`	`54`	`{`
`60`	`55`	`super.initialize(benchmark, options);`
Original file line number	Diff line number	Diff line change
`@@ -75,11 +75,6 @@ class BouncingCssShape extends BouncingParticle {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`class BouncingCssShapesStage extends BouncingParticlesStage {`
`78`		`- constructor()`
`79`		`- {`
`80`		`- super();`
`81`		`- }`
`82`		`-`
`83`	`78`	`initialize(benchmark, options)`
`84`	`79`	`{`
`85`	`80`	`super.initialize(benchmark, options);`
Original file line number	Diff line number	Diff line change
`@@ -36,11 +36,6 @@ class BouncingSvgImage extends BouncingSvgParticle {`
`36`	`36`	`)`
`37`	`37`
`38`	`38`	`class BouncingSvgImagesStage extends BouncingSvgParticlesStage {`
`39`		`- constructor()`
`40`		`- {`
`41`		`- super();`
`42`		`- }`
`43`		`-`
`44`	`39`	`initialize(benchmark, options)`
`45`	`40`	`{`
`46`	`41`	`super.initialize(benchmark, options);`
Original file line number	Diff line number	Diff line change
`@@ -55,11 +55,6 @@ class BouncingSvgParticle extends BouncingParticle {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`class BouncingSvgParticlesStage extends BouncingParticlesStage {`
`58`		`- constructor()`
`59`		`- {`
`60`		`- super();`
`61`		`- }`
`62`		`-`
`63`	`58`	`_createDefs()`
`64`	`59`	`{`
`65`	`60`	`return Utilities.createSVGElement("defs", {}, {}, this.element);`
Original file line number	Diff line number	Diff line change
`@@ -69,11 +69,6 @@ class BouncingSvgShape extends BouncingSvgParticle {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`class BouncingSvgShapesStage extends BouncingSvgParticlesStage {`
`72`		`- constructor()`
`73`		`- {`
`74`		`- super();`
`75`		`- }`
`76`		`-`
`77`	`72`	`initialize(benchmark, options)`
`78`	`73`	`{`
`79`	`74`	`super.initialize(benchmark, options);`