Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Unified Diff: third_party/WebKit/LayoutTests/fast/dom/geometry-interfaces-dom-matrix-multiply.html

Issue 2370623003: [GeometryInterface] Clean-up layout tests for geometry interfaces. (Closed)
Patch Set: [GeometryInterface] Fix a indentation and clean up. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/LayoutTests/fast/dom/geometry-interfaces-dom-matrix-multiply.html
diff --git a/third_party/WebKit/LayoutTests/fast/dom/geometry-interfaces-dom-matrix-multiply.html b/third_party/WebKit/LayoutTests/fast/dom/geometry-interfaces-dom-matrix-multiply.html
index b65d8000249f53cbdb738b5f00026452cb887a94..bc66520191d0424cbbaf580a93183ab67ea70e82 100644
--- a/third_party/WebKit/LayoutTests/fast/dom/geometry-interfaces-dom-matrix-multiply.html
+++ b/third_party/WebKit/LayoutTests/fast/dom/geometry-interfaces-dom-matrix-multiply.html
@@ -1,13 +1,8 @@
<!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();
matrix.a = 1;
@@ -16,9 +11,7 @@ test(function() {
matrix.d = 4;
matrix.e = 5;
matrix.f = 6;
- assert_true(matrix.is2D);
- assert_false(matrix.isIdentity);
- assert_array_equals(matrix.toFloat64Array(), [ 1, 2, 0, 0, 3, 4, 0, 0, 0, 0, 1, 0, 5, 6, 0, 1 ]);
+ assert_2d_matrix_equals(matrix, [1, 2, 3, 4, 5, 6]);
var other = new DOMMatrix();
other.m11 = 6;
other.m21 = 5;
@@ -26,13 +19,9 @@ test(function() {
other.m33 = 3;
other.m41 = 2;
other.m43 = 1;
- assert_false(other.is2D);
- assert_false(other.isIdentity);
- assert_array_equals(other.toFloat64Array(), [ 6, 0, 0, 0, 5, 1, 0, 0, 4, 0, 3, 0, 2, 0, 1, 1 ]);
+ assert_3d_matrix_equals(other, [6, 0, 0, 0, 5, 1, 0, 0, 4, 0, 3, 0, 2, 0, 1, 1]);
var result = matrix.multiply(other);
- assert_false(result.is2D);
- assert_false(result.isIdentity);
- assert_array_equals(result.toFloat64Array(), [ 6, 12, 0, 0, 8, 14, 0, 0, 4, 8, 3, 0, 7, 10, 1, 1 ]);
+ assert_3d_matrix_equals(result, [6, 12, 0, 0, 8, 14, 0, 0, 4, 8, 3, 0, 7, 10, 1, 1]);
matrix.multiplySelf(other);
assert_false(matrix.is2D);
assert_false(matrix.isIdentity);
@@ -47,9 +36,7 @@ test(function() {
matrix.d = 4;
matrix.e = 5;
matrix.f = 6;
- assert_true(matrix.is2D);
- assert_false(matrix.isIdentity);
- assert_array_equals(matrix.toFloat64Array(), [ 1, 2, 0, 0, 3, 4, 0, 0, 0, 0, 1, 0, 5, 6, 0, 1 ]);
+ assert_2d_matrix_equals(matrix, [1, 2, 3, 4, 5, 6]);
var other = new DOMMatrix();
other.m11 = 6;
other.m21 = 5;
@@ -57,16 +44,9 @@ test(function() {
other.m33 = 3;
other.m41 = 2;
other.m43 = 1;
- assert_false(other.is2D);
- assert_false(other.isIdentity);
- assert_array_equals(other.toFloat64Array(), [ 6, 0, 0, 0, 5, 1, 0, 0, 4, 0, 3, 0, 2, 0, 1, 1 ]);
+ assert_3d_matrix_equals(other, [6, 0, 0, 0, 5, 1, 0, 0, 4, 0, 3, 0, 2, 0, 1, 1]);
var result = matrix.preMultiplySelf(other);
- assert_false(result.is2D);
- assert_false(result.isIdentity);
- assert_array_equals(result.toFloat64Array(), [ 16, 2, 0, 0, 38, 4, 0, 0, 4, 0, 3, 0, 62, 6, 1, 1 ]);
+ assert_3d_matrix_equals(result, [16, 2, 0, 0, 38, 4, 0, 0, 4, 0, 3, 0, 62, 6, 1, 1]);
assert_array_equals(matrix.toFloat64Array(), result.toFloat64Array());
}, "DOMMatrix.preMultiplySelf(other)");
-
</script>
-</body>
-</html>

Powered by Google App Engine
This is Rietveld 408576698