1 files changed, 49 insertions, 20 deletions
diff --git a/testing/web-platform/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html b/testing/web-platform/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html
index 242094d9f9..0370c1387b 100644
--- a/testing/web-platform/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html
+++ b/testing/web-platform/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html
@@ -6,11 +6,11 @@
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
 <h1>2d.filter.canvasFilterObject.colorMatrix.tentative</h1>
-<p class="desc">Test the functionality of ColorMatrix filters in CanvasFilter objects</p>
+<p class="desc">Test the functionality of ColorMatrix filters</p>
 
 
 <script>
-var t = async_test("Test the functionality of ColorMatrix filters in CanvasFilter objects");
+var t = async_test("Test the functionality of ColorMatrix filters");
 var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
@@ -20,38 +20,67 @@ t.step(function() {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  assert_throws_js(TypeError, function() { new CanvasFilter({name: 'colorMatrix', values: undefined}); });
-  assert_throws_js(TypeError, function() { new CanvasFilter({name: 'colorMatrix', values: 'foo'}); });
-  assert_throws_js(TypeError, function() { new CanvasFilter({name: 'colorMatrix', values: null}); });
-  assert_throws_js(TypeError, function() { new CanvasFilter({name: 'colorMatrix', values: [1, 2, 3]}); });
-  assert_throws_js(TypeError, function() { new CanvasFilter({name: 'colorMatrix', values: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 'a']}); });
-  assert_throws_js(TypeError, function() { new CanvasFilter({name: 'colorMatrix', values: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, Infinity]}); });
+  assert_throws_js(TypeError, function() { ctx.filter = new CanvasFilter(
+    {name: 'colorMatrix', values: undefined}); });
+
+  assert_throws_js(TypeError, function() { ctx.filter = new CanvasFilter(
+    {name: 'colorMatrix', values: 'foo'}); });
+
+  assert_throws_js(TypeError, function() { ctx.filter = new CanvasFilter(
+    {name: 'colorMatrix', values: null}); });
+
+  assert_throws_js(TypeError, function() { ctx.filter = new CanvasFilter(
+    {name: 'colorMatrix', values: [1, 2, 3]}); });
+
+  assert_throws_js(TypeError, function() { ctx.filter = new CanvasFilter(
+    {name: 'colorMatrix',
+     values: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+              19, 'a']}); });
+
+  assert_throws_js(TypeError, function() { ctx.filter = new CanvasFilter(
+    {name: 'colorMatrix',
+     values: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+              19, Infinity]}); });
+
   ctx.fillStyle = '#f00';
-  ctx.filter = new CanvasFilter({name: 'colorMatrix', type: 'hueRotate', values: 0});
+  ctx.filter = new CanvasFilter(
+    {name: 'colorMatrix', type: 'hueRotate', values: 0});
   ctx.fillRect(0, 0, 100, 50);
   _assertPixelApprox(canvas, 10,10, 255,0,0,255, 2);
-  ctx.filter = new CanvasFilter({name: 'colorMatrix', type: 'hueRotate', values: 90});
+
+  ctx.filter = new CanvasFilter(
+    {name: 'colorMatrix', type: 'hueRotate', values: 90});
   ctx.fillRect(0, 0, 100, 50);
   _assertPixelApprox(canvas, 10,10, 0,91,0,255, 2);
-  ctx.filter = new CanvasFilter({name: 'colorMatrix', type: 'hueRotate', values: 180});
+
+  ctx.filter = new CanvasFilter(
+    {name: 'colorMatrix', type: 'hueRotate', values: 180});
   ctx.fillRect(0, 0, 100, 50);
   _assertPixelApprox(canvas, 10,10, 0,109,109,255, 2);
-  ctx.filter = new CanvasFilter({name: 'colorMatrix', type: 'hueRotate', values: 270});
+
+  ctx.filter = new CanvasFilter(
+    {name: 'colorMatrix', type: 'hueRotate', values: 270});
   ctx.fillRect(0, 0, 100, 50);
   _assertPixelApprox(canvas, 10,10, 109,18,255,255, 2);
-  ctx.filter = new CanvasFilter({name: 'colorMatrix', type: 'saturate', values: 0.5});
+
+  ctx.filter = new CanvasFilter(
+    {name: 'colorMatrix', type: 'saturate', values: 0.5});
   ctx.fillRect(0, 0, 100, 50);
   _assertPixelApprox(canvas, 10,10, 155,27,27,255, 2);
+
   ctx.clearRect(0, 0, 100, 50);
-  ctx.filter = new CanvasFilter({name: 'colorMatrix', type: 'luminanceToAlpha'});
+  ctx.filter = new CanvasFilter(
+    {name: 'colorMatrix', type: 'luminanceToAlpha'});
   ctx.fillRect(0, 0, 100, 50);
   _assertPixelApprox(canvas, 10,10, 0,0,0,54, 2);
-  ctx.filter = new CanvasFilter({name: 'colorMatrix', values: [
-          0, 0, 0, 0, 0,
-          1, 1, 1, 1, 0,
-          0, 0, 0, 0, 0,
-          0, 0, 0, 1, 0
-  ]});
+
+  ctx.filter = new CanvasFilter(
+    {name: 'colorMatrix', values: [
+      0, 0, 0, 0, 0,
+      1, 1, 1, 1, 0,
+      0, 0, 0, 0, 0,
+      0, 0, 0, 1, 0
+    ]});
   ctx.fillRect(0, 0, 50, 25);
   ctx.fillStyle = '#0f0';
   ctx.fillRect(50, 0, 50, 25);