| Index: third_party/WebKit/LayoutTests/fast/dom/geometry-interfaces-dom-matrix-scale.html
|
| diff --git a/third_party/WebKit/LayoutTests/fast/dom/geometry-interfaces-dom-matrix-scale.html b/third_party/WebKit/LayoutTests/fast/dom/geometry-interfaces-dom-matrix-scale.html
|
| index 0ed32141b4f88647d1627e5430a5376b600d9b58..17bb0bc6c211db3d1429b54ec75ebcc5b41afec8 100644
|
| --- a/third_party/WebKit/LayoutTests/fast/dom/geometry-interfaces-dom-matrix-scale.html
|
| +++ b/third_party/WebKit/LayoutTests/fast/dom/geometry-interfaces-dom-matrix-scale.html
|
| @@ -3,21 +3,46 @@
|
| <script src="../../resources/testharnessreport.js"></script>
|
| <script src="./resources/geometry-interfaces-test-helpers.js"></script>
|
| <script>
|
| +
|
| +test(function() {
|
| + var matrix = new DOMMatrix();
|
| + assert_identity_2d_matrix(matrix);
|
| + var result = matrix.scale();
|
| + assert_identity_2d_matrix(result);
|
| + assert_identity_2d_matrix(matrix);
|
| +}, "DOMMatrix.scale()");
|
| +
|
| test(function() {
|
| var matrix = new DOMMatrix();
|
| assert_identity_2d_matrix(matrix);
|
| var result = matrix.scale(3);
|
| assert_2d_matrix_equals(result, [3, 0, 0, 3, 0, 0]);
|
| assert_identity_2d_matrix(matrix);
|
| -}, "DOMMatrix.scale(scale)");
|
| +}, "DOMMatrix.scale(sx)");
|
| +
|
| +test(function() {
|
| + var matrix = new DOMMatrix();
|
| + assert_identity_2d_matrix(matrix);
|
| + var result = matrix.scale(3, 3);
|
| + assert_2d_matrix_equals(result, [3, 0, 0, 3, 0, 0]);
|
| + assert_identity_2d_matrix(matrix);
|
| +}, "DOMMatrix.scale(sx, sy)");
|
|
|
| test(function() {
|
| var matrix = new DOMMatrix();
|
| assert_identity_2d_matrix(matrix);
|
| - var result = matrix.scale(3, 4, 2);
|
| + var result = matrix.scale(3, 3, 1, 4, 2);
|
| assert_2d_matrix_equals(result, [3, 0, 0, 3, -8, -4]);
|
| assert_identity_2d_matrix(matrix);
|
| -}, "DOMMatrix.scale(scale, ox, oy)");
|
| +}, "DOMMatrix.scale(sx, sy, sz, ox, oy)");
|
| +
|
| +test(function() {
|
| + var matrix = new DOMMatrix();
|
| + assert_identity_2d_matrix(matrix);
|
| + var result = matrix.scale(2, 3, 0.5, 2, -4, -1);
|
| + assert_3d_matrix_equals(result, [2, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0.5, 0, -2, 8, -0.5, 1]);
|
| + assert_identity_2d_matrix(matrix);
|
| +}, "DOMMatrix.scale(sx, sy, sz, ox, oy, oz)");
|
|
|
| test(function() {
|
| var matrix = new DOMMatrix();
|
| @@ -38,10 +63,10 @@ test(function() {
|
| test(function() {
|
| var matrix = new DOMMatrix();
|
| assert_identity_2d_matrix(matrix);
|
| - var result = matrix.scaleNonUniform(2, 3, 0.5, 2, -4, -1);
|
| - assert_3d_matrix_equals(result, [2, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0.5, 0, -2, 8, -0.5, 1]);
|
| + var result = matrix.scaleSelf();
|
| + assert_identity_2d_matrix(result);
|
| assert_identity_2d_matrix(matrix);
|
| -}, "DOMMatrix.scaleNonUniform(sx, sy, sz, ox, oy, oz)");
|
| +}, "DOMMatrix.scaleSelf()");
|
|
|
| test(function() {
|
| var matrix = new DOMMatrix();
|
| @@ -49,15 +74,39 @@ test(function() {
|
| var result = matrix.scaleSelf(3);
|
| assert_2d_matrix_equals(result, [3, 0, 0, 3, 0, 0]);
|
| assert_2d_matrix_equals(matrix, [3, 0, 0, 3, 0, 0]);
|
| -}, "DOMMatrix.scaleSelf(scale)");
|
| +}, "DOMMatrix.scaleSelf(sx)");
|
| +
|
| +test(function() {
|
| + var matrix = new DOMMatrix();
|
| + assert_identity_2d_matrix(matrix);
|
| + var result = matrix.scaleSelf(3, 3);
|
| + assert_2d_matrix_equals(result, [3, 0, 0, 3, 0, 0]);
|
| + assert_2d_matrix_equals(matrix, [3, 0, 0, 3, 0, 0]);
|
| +}, "DOMMatrix.scaleSelf(sx, sy)");
|
|
|
| test(function() {
|
| var matrix = new DOMMatrix();
|
| assert_identity_2d_matrix(matrix);
|
| - var result = matrix.scaleSelf(3, 4, 2);
|
| + var result = matrix.scaleSelf(3, 3, 1, 4, 2);
|
| assert_2d_matrix_equals(result, [3, 0, 0, 3, -8, -4]);
|
| assert_2d_matrix_equals(matrix, [3, 0, 0, 3, -8, -4]);
|
| -}, "DOMMatrix.scaleSelf(scale)");
|
| +}, "DOMMatrix.scaleSelf(sx, sy, sz, ox, oy)");
|
| +
|
| +test(function() {
|
| + var matrix = new DOMMatrix();
|
| + assert_identity_2d_matrix(matrix);
|
| + var result = matrix.scaleSelf(2, 3, 0.5, 2, -4, -1);
|
| + assert_3d_matrix_equals(result, [2, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0.5, 0, -2, 8, -0.5, 1]);
|
| + assert_3d_matrix_equals(matrix, [2, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0.5, 0, -2, 8, -0.5, 1]);
|
| +}, "DOMMatrix.scaleSelf(sx, sy, sz, ox, oy, oz)");
|
| +
|
| +test(function() {
|
| + var matrix = new DOMMatrix();
|
| + assert_identity_2d_matrix(matrix);
|
| + var result = matrix.scaleSelf(1, 1, 1, 2, -4, -1);
|
| + assert_identity_3d_matrix(result);
|
| + assert_identity_3d_matrix(matrix);
|
| +}, "DOMMatrix.scaleSelf(1, 1, 1, ox, oy, oz)");
|
|
|
| test(function() {
|
| var matrix = new DOMMatrix();
|
| @@ -75,19 +124,4 @@ test(function() {
|
| assert_3d_matrix_equals(matrix, [3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, -4, -14, 2, 1]);
|
| }, "DOMMatrix.scale3dSelf(scale, ox, oy, oz)");
|
|
|
| -test(function() {
|
| - var matrix = new DOMMatrix();
|
| - assert_identity_2d_matrix(matrix);
|
| - var result = matrix.scaleNonUniformSelf(2, 3, 0.5, 2, -4, -1);
|
| - assert_3d_matrix_equals(result, [2, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0.5, 0, -2, 8, -0.5, 1]);
|
| - assert_3d_matrix_equals(matrix, [2, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0.5, 0, -2, 8, -0.5, 1]);
|
| -}, "DOMMatrix.scaleNonUniformSelf(sx, sy, sz, ox, oy, oz)");
|
| -
|
| -test(function() {
|
| - var matrix = new DOMMatrix();
|
| - assert_identity_2d_matrix(matrix);
|
| - var result = matrix.scaleNonUniformSelf(1, 1, 1, 2, -4, -1);
|
| - assert_identity_3d_matrix(result);
|
| - assert_identity_3d_matrix(matrix);
|
| -}, "DOMMatrix.scaleNonUniformSelf(1, 1, 1, ox, oy, oz)");
|
| </script>
|
|
|