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

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

Issue 2387003002: [GeometryInterface] remove scaleNonUniform* method. (Closed)
Patch Set: rebase origin Created 4 years, 2 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
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..2f790fb47602113bab979a6ea6afbd20fc25e24b 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,55 @@
<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);
+ assert_not_equals(result, matrix, 'result and matrix should be different object');
+}, "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, 4, 2);
+ 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, 8);
+ assert_2d_matrix_equals(result, [3, 0, 0, 8, 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, 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,56 +72,76 @@ 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]);
- assert_identity_2d_matrix(matrix);
-}, "DOMMatrix.scaleNonUniform(sx, sy, sz, ox, oy, oz)");
+ var result = matrix.scaleSelf();
+ assert_identity_2d_matrix(result);
+ assert_equals(result, matrix, 'result and matrix should be the exact same object');
+}, "DOMMatrix.scaleSelf()");
test(function() {
var matrix = new DOMMatrix();
assert_identity_2d_matrix(matrix);
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)");
+ assert_equals(result, matrix, 'result and matrix should be the exact same object');
+}, "DOMMatrix.scaleSelf(sx)");
test(function() {
var matrix = new DOMMatrix();
assert_identity_2d_matrix(matrix);
- var result = matrix.scaleSelf(3, 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)");
+ var result = matrix.scaleSelf(3, 3);
+ assert_2d_matrix_equals(result, [3, 0, 0, 3, 0, 0]);
+ assert_equals(result, matrix, 'result and matrix should be the exact same object');
+}, "DOMMatrix.scaleSelf(sx, sy)");
test(function() {
var matrix = new DOMMatrix();
assert_identity_2d_matrix(matrix);
- var result = matrix.scale3dSelf(3);
- 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)");
+ var result = matrix.scaleSelf(3, 7);
+ assert_2d_matrix_equals(result, [3, 0, 0, 7, 0, 0]);
+ assert_equals(result, matrix, 'result and matrix should be the exact same object');
+}, "DOMMatrix.scaleSelf(sx, sy)");
test(function() {
var matrix = new DOMMatrix();
assert_identity_2d_matrix(matrix);
- var result = matrix.scale3dSelf(3, 2, 7, -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)");
+ var result = matrix.scaleSelf(3, 3, 1, 4, 2);
+ assert_2d_matrix_equals(result, [3, 0, 0, 3, -8, -4]);
+ assert_equals(result, matrix, 'result and matrix should be the exact same object');
+}, "DOMMatrix.scaleSelf(sx, sy, sz, ox, oy)");
test(function() {
var matrix = new DOMMatrix();
assert_identity_2d_matrix(matrix);
- var result = matrix.scaleNonUniformSelf(2, 3, 0.5, 2, -4, -1);
+ 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.scaleNonUniformSelf(sx, sy, sz, ox, oy, oz)");
+ assert_equals(result, matrix, 'result and matrix should be the exact same object');
+}, "DOMMatrix.scaleSelf(sx, sy, sz, ox, oy, oz)");
+// origin value is used to move base point before scale.
+// after scale, base point is return to negative origin value.
+// if scale value were 1, value of matrix should be same before scale.
test(function() {
var matrix = new DOMMatrix();
assert_identity_2d_matrix(matrix);
- var result = matrix.scaleNonUniformSelf(1, 1, 1, 2, -4, -1);
+ var result = matrix.scaleSelf(1, 1, 1, 2, -4, -1);
assert_identity_3d_matrix(result);
- assert_identity_3d_matrix(matrix);
-}, "DOMMatrix.scaleNonUniformSelf(1, 1, 1, ox, oy, oz)");
+ assert_equals(result, matrix, 'result and matrix should be the exact same object');
+}, "DOMMatrix.scaleSelf(1, 1, 1, ox, oy, oz)");
+
+test(function() {
+ var matrix = new DOMMatrix();
+ assert_identity_2d_matrix(matrix);
+ var result = matrix.scale3dSelf(3);
+ assert_3d_matrix_equals(result, [3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1]);
+ assert_equals(result, matrix, 'result and matrix should be the exact same object');
+}, "DOMMatrix.scale3dSelf(scale)");
+
+test(function() {
+ var matrix = new DOMMatrix();
+ assert_identity_2d_matrix(matrix);
+ var result = matrix.scale3dSelf(3, 2, 7, -1);
+ assert_3d_matrix_equals(result, [3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, -4, -14, 2, 1]);
+ assert_equals(result, matrix, 'result and matrix should be the exact same object');
+}, "DOMMatrix.scale3dSelf(scale, ox, oy, oz)");
+
</script>
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698