Reject kernelMatrix with 0 width in convolveMatrix CanvasFilters.

Only the height was checked (rejecting `[]` kernels) but kernels with
zero width like `[[], []]` were incorrectly accepted.

The current CanvasFilter specification is defined by reusing the
SVG specification for how the filters attributes work
(whatwg/html#6763). For the
"feConvolveMatrix" filter, the SVG specification says
(https://www.w3.org/TR/SVG11/filters.html#feConvolveMatrixElement):

"Attribute definitions:
- order = "<number-optional-number>"
  Indicates the number of cells in each dimension for ‘kernelMatrix’.
  The values provided must be <integer>s greater than zero. The first
  number, <orderX>, indicates the number of columns in the matrix.
  The second number, <orderY>, indicates the number of rows in the
  matrix. If <orderY> is not provided, it defaults to <orderX>."

Change-Id: I23baf05db73e679a52cd9d553d7c6308d91b56f9
Bug: 1428652
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4377066
Reviewed-by: Aaron Krajeski <[email protected]>
Commit-Queue: Jean-Philippe Gravel <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1124423}

Author: graveljp

third_party/blink/renderer/modules/canvas/canvas2d/canvas_filter_operation_resolver.cc

@@ -65,7 +65,8 @@ absl::optional<KernelMatrix> GetKernelMatrix(const Dictionary& dict,
   absl::optional<Vector<Vector<float>>> km_input =
       dict.Get<IDLSequence<IDLSequence<IDLFloat>>>("kernelMatrix",
                                                    exception_state);
-  if (!km_input.has_value() || km_input->size() == 0) {
+  if (!km_input.has_value() || km_input->size() == 0 ||
+      (km_input->size() >= 2 && km_input->at(0).size() == 0)) {
     exception_state.ThrowTypeError(
         "Failed to construct convolve matrix filter. 'kernelMatrix' must be an "
         "array of arrays of numbers representing an n by m matrix.");

third_party/blink/web_tests/external/wpt/html/canvas/element/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html

@@ -28,8 +28,14 @@ <h1>2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative</h1>
 assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[1, 0], 0]}); });
 assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[1, 0], [0, Infinity]]}); });
 assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: []}); });
+assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [1]}); });
+assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [1, 2, 3, 4]}); });
+assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[], []]}); });
+assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[1, 2], []]}); });
+assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[], [1, 2]]}); });
 // This should not throw an error
 ctx.filter = new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[]]});
+ctx.filter = new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[1]]});
 
 
 });

third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html

@@ -30,8 +30,14 @@ <h1>2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative</h1>
 assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[1, 0], 0]}); });
 assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[1, 0], [0, Infinity]]}); });
 assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: []}); });
+assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [1]}); });
+assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [1, 2, 3, 4]}); });
+assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[], []]}); });
+assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[1, 2], []]}); });
+assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[], [1, 2]]}); });
 // This should not throw an error
 ctx.filter = new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[]]});
+ctx.filter = new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[1]]});
 })(canvas, ctx);
 t.done();
 

third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.worker.js

@@ -25,8 +25,14 @@ assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatr
 assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[1, 0], 0]}); });
 assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[1, 0], [0, Infinity]]}); });
 assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: []}); });
+assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [1]}); });
+assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [1, 2, 3, 4]}); });
+assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[], []]}); });
+assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[1, 2], []]}); });
+assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[], [1, 2]]}); });
 // This should not throw an error
 ctx.filter = new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[]]});
+ctx.filter = new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[1]]});
 t.done();
 
 });

third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml-new/filters.yaml

@@ -154,8 +154,14 @@
     @assert throws TypeError new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[1, 0], 0]});
     @assert throws TypeError new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[1, 0], [0, Infinity]]});
     @assert throws TypeError new CanvasFilter({filter: "convolveMatrix", kernelMatrix: []});
+    @assert throws TypeError new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [1]});
+    @assert throws TypeError new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [1, 2, 3, 4]});
+    @assert throws TypeError new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[], []]});
+    @assert throws TypeError new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[1, 2], []]});
+    @assert throws TypeError new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[], [1, 2]]});
     // This should not throw an error
     ctx.filter = new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[]]});
+    ctx.filter = new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[1]]});
 
 - name: 2d.filter.canvasFilterObject.componentTransfer.linear.tentative
   desc: Test pixels on CanvasFilter() componentTransfer with linear type