Add getTransform function to offscreen canvases (#20037)

* Add getTransform function to offscreen canvases It seems like maybe this was just overlooked? The fix is as easy as adding it to the idl file. It seems like this is already in the spec as: https://html.spec.whatwg.org/multipage/canvas.html#offscreencanvasrenderingcontext2d contains the line OffscreenCanvasRenderingContext2D includes CanvasTransform; And https://html.spec.whatwg.org/multipage/canvas.html#canvastransform lists the getTransform() function. Bug: 1016454 Change-Id: Icb5405d716524e2a0b6935db81b18ff53cd31d4f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1872562 Reviewed-by: Chris Harrelson <[email protected]> Reviewed-by: Fernando Serboncini <[email protected]> Reviewed-by: Juanmi Huertas <[email protected]> Commit-Queue: Aaron Krajeski <[email protected]> Cr-Commit-Position: refs/heads/master@{#713886} * Remove setTransform() from tests2d.yaml
web-platform-tests · Nov 11, 2019 · 0869400 · 0869400
1 parent 8e6b2e4
commit 0869400
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 3 deletions.
diff --git a/2dcontext/transformations/2d.transformation.getTransform.html b/2dcontext/transformations/2d.transformation.getTransform.html
@@ -0,0 +1,39 @@
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+// Ensure that context2d.getTransform works
+const epsilon = 1e-5;
+const canvas = document.createElement('canvas');
+const ctx = canvas.getContext('2d');
+
+test(function(t) {
+  assert_array_equals(ctx.getTransform().toFloat32Array(),
+    [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1],
+    "Assert that an untransformed matrix is identity");
+
+  ctx.scale(2, 3);
+  transform = ctx.getTransform();
+  assert_array_equals(ctx.getTransform().toFloat32Array(),
+    [2, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1],
+    "Assert that context2d scaling works");
+
+  ctx.rotate(Math.PI/2);
+  transform = ctx.getTransform();
+  assert_array_approx_equals(ctx.getTransform().toFloat32Array(),
+    [0, 3, 0, 0, -2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], epsilon,
+    "Assert that context2d rotate works");
+
+  ctx.translate(1, -1);
+  transform = ctx.getTransform();
+  assert_array_approx_equals(ctx.getTransform().toFloat32Array(),
+    [0, 3, 0, 0, -2, 0, 0, 0, 0, 0, 1, 0, 2, 3, 0, 1], epsilon,
+    "Assert context2d translate works.");
+
+  ctx.resetTransform();
+  assert_array_equals(ctx.getTransform().toFloat32Array(),
+    [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1],
+    "Assert that a reset matrix is identity");
+}, 'This test ensures that getTransform works correctly.');
+</script>
+</body>
diff --git a/offscreen-canvas/conformance-requirements/2d.missingargs.html b/offscreen-canvas/conformance-requirements/2d.missingargs.html
@@ -30,7 +30,6 @@ <h1>2d.missingargs</h1>
     assert_throws(new TypeError(), function() { ctx.transform(1, 0, 0, 1, 0); });
 }
 if (ctx.setTransform) {
-    assert_throws(new TypeError(), function() { ctx.setTransform(); });
     assert_throws(new TypeError(), function() { ctx.setTransform(1); });
     assert_throws(new TypeError(), function() { ctx.setTransform(1, 0); });
     assert_throws(new TypeError(), function() { ctx.setTransform(1, 0, 0); });

diff --git a/offscreen-canvas/conformance-requirements/2d.missingargs.worker.js b/offscreen-canvas/conformance-requirements/2d.missingargs.worker.js
@@ -26,7 +26,6 @@ if (ctx.transform) { // (avoid spurious failures, since the aim here is not to t
     assert_throws(new TypeError(), function() { ctx.transform(1, 0, 0, 1, 0); });
 }
 if (ctx.setTransform) {
-    assert_throws(new TypeError(), function() { ctx.setTransform(); });
     assert_throws(new TypeError(), function() { ctx.setTransform(1); });
     assert_throws(new TypeError(), function() { ctx.setTransform(1, 0); });
     assert_throws(new TypeError(), function() { ctx.setTransform(1, 0, 0); });

diff --git a/offscreen-canvas/tools/tests2d.yaml b/offscreen-canvas/tools/tests2d.yaml
@@ -8800,7 +8800,6 @@
         @assert throws TypeError ctx.transform(1, 0, 0, 1, 0);
     }
     if (ctx.setTransform) {
-        @assert throws TypeError ctx.setTransform();
         @assert throws TypeError ctx.setTransform(1);
         @assert throws TypeError ctx.setTransform(1, 0);
         @assert throws TypeError ctx.setTransform(1, 0, 0);

diff --git a/offscreen-canvas/transformations/2d.transformation.getTransform.html b/offscreen-canvas/transformations/2d.transformation.getTransform.html
@@ -0,0 +1,40 @@
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+// Ensure that context2d.getTransform works
+const epsilon = 1e-5;
+const canvas = new OffscreenCanvas(300, 150);
+const ctx = canvas.getContext('2d');
+
+test(function(t) {
+
+  assert_array_equals(ctx.getTransform().toFloat32Array(),
+    [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1],
+    "Assert that an untransformed matrix is identity");
+
+  ctx.scale(2, 3);
+  transform = ctx.getTransform();
+  assert_array_equals(ctx.getTransform().toFloat32Array(),
+    [2, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1],
+    "Assert that context2d scaling works");
+
+  ctx.rotate(Math.PI/2);
+  transform = ctx.getTransform();
+  assert_array_approx_equals(ctx.getTransform().toFloat32Array(),
+    [0, 3, 0, 0, -2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], epsilon,
+    "Assert that context2d rotate works");
+
+  ctx.translate(1, -1);
+  transform = ctx.getTransform();
+  assert_array_approx_equals(ctx.getTransform().toFloat32Array(),
+    [0, 3, 0, 0, -2, 0, 0, 0, 0, 0, 1, 0, 2, 3, 0, 1], epsilon,
+    "Assert context2d translate works.");
+
+  ctx.resetTransform();
+  assert_array_equals(ctx.getTransform().toFloat32Array(),
+    [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1],
+    "Assert that a reset matrix is identity");
+}, 'This test ensures that getTransform works correctly.');
+</script>
+</body>