| 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 4f795d87a6f6482af1450c86f5ac65e930683f91..0ed32141b4f88647d1627e5430a5376b600d9b58 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
|
| @@ -1,167 +1,93 @@
|
| <!DOCTYPE html>
|
| -<html>
|
| -<head>
|
| -<title>Geometry Interfaces: DOMMatrix scale</title>
|
| <script src="../../resources/testharness.js"></script>
|
| <script src="../../resources/testharnessreport.js"></script>
|
| -</head>
|
| -<body>
|
| +<script src="./resources/geometry-interfaces-test-helpers.js"></script>
|
| <script>
|
| -
|
| test(function() {
|
| var matrix = new DOMMatrix();
|
| - assert_true(matrix.is2D);
|
| - assert_true(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| + assert_identity_2d_matrix(matrix);
|
| var result = matrix.scale(3);
|
| - assert_true(result.is2D);
|
| - assert_false(result.isIdentity);
|
| - assert_array_equals(result.toFloat64Array(), [ 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| - assert_true(matrix.is2D);
|
| - assert_true(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| + assert_2d_matrix_equals(result, [3, 0, 0, 3, 0, 0]);
|
| + assert_identity_2d_matrix(matrix);
|
| }, "DOMMatrix.scale(scale)");
|
|
|
| test(function() {
|
| var matrix = new DOMMatrix();
|
| - assert_true(matrix.is2D);
|
| - assert_true(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| + assert_identity_2d_matrix(matrix);
|
| var result = matrix.scale(3, 4, 2);
|
| - assert_true(result.is2D);
|
| - assert_false(result.isIdentity);
|
| - assert_array_equals(result.toFloat64Array(), [ 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1, 0, -8, -4, 0, 1 ]);
|
| - assert_true(matrix.is2D);
|
| - assert_true(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| + assert_2d_matrix_equals(result, [3, 0, 0, 3, -8, -4]);
|
| + assert_identity_2d_matrix(matrix);
|
| }, "DOMMatrix.scale(scale, ox, oy)");
|
|
|
| test(function() {
|
| var matrix = new DOMMatrix();
|
| - assert_true(matrix.is2D);
|
| - assert_true(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| + assert_identity_2d_matrix(matrix);
|
| var result = matrix.scale3d(3);
|
| - assert_false(result.is2D);
|
| - assert_false(result.isIdentity);
|
| - assert_array_equals(result.toFloat64Array(), [ 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1 ]);
|
| - assert_true(matrix.is2D);
|
| - assert_true(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| + assert_3d_matrix_equals(result, [3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1]);
|
| + assert_identity_2d_matrix(matrix);
|
| }, "DOMMatrix.scale3d(scale)");
|
|
|
| test(function() {
|
| var matrix = new DOMMatrix();
|
| - assert_true(matrix.is2D);
|
| - assert_true(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| + assert_identity_2d_matrix(matrix);
|
| var result = matrix.scale3d(3, 2, 7, -1);
|
| - assert_false(result.is2D);
|
| - assert_false(result.isIdentity);
|
| - assert_array_equals(result.toFloat64Array(), [ 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, -4, -14, 2, 1 ]);
|
| - assert_true(matrix.is2D);
|
| - assert_true(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| + assert_3d_matrix_equals(result, [3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, -4, -14, 2, 1]);
|
| + assert_identity_2d_matrix(matrix);
|
| }, "DOMMatrix.scale3d(scale, ox, oy, oz)");
|
|
|
| test(function() {
|
| var matrix = new DOMMatrix();
|
| - assert_true(matrix.is2D);
|
| - assert_true(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| + assert_identity_2d_matrix(matrix);
|
| var result = matrix.scaleNonUniform(2, 3, 0.5, 2, -4, -1);
|
| - assert_false(result.is2D);
|
| - assert_false(result.isIdentity);
|
| - assert_array_equals(result.toFloat64Array(), [ 2, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0.5, 0, -2, 8, -0.5, 1 ]);
|
| - assert_true(matrix.is2D);
|
| - assert_true(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 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.scaleNonUniform(sx, sy, sz, ox, oy, oz)");
|
|
|
| test(function() {
|
| var matrix = new DOMMatrix();
|
| - assert_true(matrix.is2D);
|
| - assert_true(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| + assert_identity_2d_matrix(matrix);
|
| var result = matrix.scaleSelf(3);
|
| - assert_true(result.is2D);
|
| - assert_false(result.isIdentity);
|
| - assert_array_equals(result.toFloat64Array(), [ 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| - assert_true(matrix.is2D);
|
| - assert_false(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| + 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)");
|
|
|
| test(function() {
|
| var matrix = new DOMMatrix();
|
| - assert_true(matrix.is2D);
|
| - assert_true(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| + assert_identity_2d_matrix(matrix);
|
| var result = matrix.scaleSelf(3, 4, 2);
|
| - assert_true(result.is2D);
|
| - assert_false(result.isIdentity);
|
| - assert_array_equals(result.toFloat64Array(), [ 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1, 0, -8, -4, 0, 1 ]);
|
| - assert_true(matrix.is2D);
|
| - assert_false(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1, 0, -8, -4, 0, 1 ]);
|
| + 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)");
|
|
|
| test(function() {
|
| var matrix = new DOMMatrix();
|
| - assert_true(matrix.is2D);
|
| - assert_true(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| + assert_identity_2d_matrix(matrix);
|
| var result = matrix.scale3dSelf(3);
|
| - assert_false(result.is2D);
|
| - assert_false(result.isIdentity);
|
| - assert_array_equals(result.toFloat64Array(), [ 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1 ]);
|
| - assert_false(matrix.is2D);
|
| - assert_false(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1 ]);
|
| + assert_3d_matrix_equals(result, [3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1]);
|
| + assert_3d_matrix_equals(matrix, [3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1]);
|
| }, "DOMMatrix.scale3dSelf(scale)");
|
|
|
| test(function() {
|
| var matrix = new DOMMatrix();
|
| - assert_true(matrix.is2D);
|
| - assert_true(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| + assert_identity_2d_matrix(matrix);
|
| var result = matrix.scale3dSelf(3, 2, 7, -1);
|
| - assert_false(result.is2D);
|
| - assert_false(result.isIdentity);
|
| - assert_array_equals(result.toFloat64Array(), [ 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, -4, -14, 2, 1 ]);
|
| - assert_false(matrix.is2D);
|
| - assert_false(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, -4, -14, 2, 1 ]);
|
| + assert_3d_matrix_equals(result, [3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, -4, -14, 2, 1]);
|
| + 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_true(matrix.is2D);
|
| - assert_true(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| + assert_identity_2d_matrix(matrix);
|
| var result = matrix.scaleNonUniformSelf(2, 3, 0.5, 2, -4, -1);
|
| - assert_false(result.is2D);
|
| - assert_false(result.isIdentity);
|
| - assert_array_equals(result.toFloat64Array(), [ 2, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0.5, 0, -2, 8, -0.5, 1 ]);
|
| - assert_false(matrix.is2D);
|
| - assert_false(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 2, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0.5, 0, -2, 8, -0.5, 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_true(matrix.is2D);
|
| - assert_true(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| + assert_identity_2d_matrix(matrix);
|
| var result = matrix.scaleNonUniformSelf(1, 1, 1, 2, -4, -1);
|
| - assert_false(result.is2D);
|
| - assert_true(result.isIdentity);
|
| - assert_array_equals(result.toFloat64Array(), [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| - assert_false(matrix.is2D);
|
| - assert_true(matrix.isIdentity);
|
| - assert_array_equals(matrix.toFloat64Array(), [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]);
|
| + assert_identity_3d_matrix(result);
|
| + assert_identity_3d_matrix(matrix);
|
| }, "DOMMatrix.scaleNonUniformSelf(1, 1, 1, ox, oy, oz)");
|
| -
|
| </script>
|
| -</body>
|
| -</html>
|
|
|