Add DOMMatrix.prototype.scaleNonUniform

servo · Jul 2, 2019 · ebdb106 · ebdb106
1 parent f4ff9e2
commit ebdb106
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 32 deletions.
diff --git a/components/script/dom/dommatrixreadonly.rs b/components/script/dom/dommatrixreadonly.rs
@@ -571,6 +571,17 @@ impl DOMMatrixReadOnlyMethods for DOMMatrixReadOnly {
             .ScaleSelf(scaleX, scaleY, scaleZ, originX, originY, originZ)
     }
 
+    fn ScaleNonUniform(&self, scaleX: f64, scaleY: f64) -> DomRoot<DOMMatrix> {
+        DOMMatrix::from_readonly(&self.global(), self).ScaleSelf(
+            scaleX,
+            Some(scaleY),
+            1.0,
+            0.0,
+            0.0,
+            0.0,
+        )
+    }
+
     // https://drafts.fxtf.org/geometry-1/#dom-dommatrixreadonly-scale3d
     fn Scale3d(&self, scale: f64, originX: f64, originY: f64, originZ: f64) -> DomRoot<DOMMatrix> {
         DOMMatrix::from_readonly(&self.global(), self).Scale3dSelf(scale, originX, originY, originZ)

diff --git a/components/script/dom/webidls/DOMMatrixReadOnly.webidl b/components/script/dom/webidls/DOMMatrixReadOnly.webidl
@@ -56,6 +56,8 @@ interface DOMMatrixReadOnly {
                     optional unrestricted double originX = 0,
                     optional unrestricted double originY = 0,
                     optional unrestricted double originZ = 0);
+    [NewObject] DOMMatrix scaleNonUniform(optional unrestricted double scaleX = 1,
+                                          optional unrestricted double scaleY = 1);
     DOMMatrix scale3d(optional unrestricted double scale = 1,
                       optional unrestricted double originX = 0,
                       optional unrestricted double originY = 0,

diff --git a/tests/wpt/metadata/css/geometry/DOMMatrix-002.html.ini b/tests/wpt/metadata/css/geometry/DOMMatrix-002.html.ini
diff --git a/tests/wpt/metadata/css/geometry/DOMMatrix-003.html.ini b/tests/wpt/metadata/css/geometry/DOMMatrix-003.html.ini
@@ -5,13 +5,3 @@
 
   [test rotateAxisAngle() ]
     expected: FAIL
-
-  [test scaleNonUniform() with sx]
-    expected: FAIL
-
-  [test scaleNonUniform() with sx, sy]
-    expected: FAIL
-
-  [test scaleNonUniform()]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/geometry/interfaces.html.ini b/tests/wpt/metadata/css/geometry/interfaces.html.ini
@@ -375,15 +375,6 @@
   [Geometry APIs interface IDL tests]
     expected: FAIL
 
-  [DOMMatrixReadOnly interface: calling scaleNonUniform(unrestricted double, unrestricted double) on new DOMMatrixReadOnly() with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [DOMMatrixReadOnly interface: new DOMMatrixReadOnly() must inherit property "scaleNonUniform(unrestricted double, unrestricted double)" with the proper type]
-    expected: FAIL
-
-  [DOMMatrixReadOnly interface: operation scaleNonUniform(unrestricted double, unrestricted double)]
-    expected: FAIL
-
   [DOMPointReadOnly interface: default toJSON operation on new DOMPoint()]
     expected: FAIL
 

diff --git a/tests/wpt/metadata/css/geometry/interfaces.worker.js.ini b/tests/wpt/metadata/css/geometry/interfaces.worker.js.ini
@@ -98,15 +98,6 @@
   [interfaces]
     expected: FAIL
 
-  [DOMMatrixReadOnly interface: calling scaleNonUniform(unrestricted double, unrestricted double) on new DOMMatrixReadOnly() with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [DOMMatrixReadOnly interface: new DOMMatrixReadOnly() must inherit property "scaleNonUniform(unrestricted double, unrestricted double)" with the proper type]
-    expected: FAIL
-
-  [DOMMatrixReadOnly interface: operation scaleNonUniform(unrestricted double, unrestricted double)]
-    expected: FAIL
-
   [DOMPointReadOnly interface: default toJSON operation on new DOMPoint()]
     expected: FAIL