| Index: cc/test/geometry_test_utils.cc
|
| diff --git a/cc/test/geometry_test_utils.cc b/cc/test/geometry_test_utils.cc
|
| index 9bf5811ec9c9044412ab205f5214f2796ffec0e4..df61c53410228ec537e0738f4c0d76045f4cae3d 100644
|
| --- a/cc/test/geometry_test_utils.cc
|
| +++ b/cc/test/geometry_test_utils.cc
|
| @@ -16,22 +16,23 @@ namespace cc {
|
|
|
| void ExpectTransformationMatrixEq(const gfx::Transform& expected,
|
| const gfx::Transform& actual) {
|
| - EXPECT_FLOAT_EQ((expected).matrix().get(0, 0), (actual).matrix().get(0, 0));
|
| - EXPECT_FLOAT_EQ((expected).matrix().get(1, 0), (actual).matrix().get(1, 0));
|
| - EXPECT_FLOAT_EQ((expected).matrix().get(2, 0), (actual).matrix().get(2, 0));
|
| - EXPECT_FLOAT_EQ((expected).matrix().get(3, 0), (actual).matrix().get(3, 0));
|
| - EXPECT_FLOAT_EQ((expected).matrix().get(0, 1), (actual).matrix().get(0, 1));
|
| - EXPECT_FLOAT_EQ((expected).matrix().get(1, 1), (actual).matrix().get(1, 1));
|
| - EXPECT_FLOAT_EQ((expected).matrix().get(2, 1), (actual).matrix().get(2, 1));
|
| - EXPECT_FLOAT_EQ((expected).matrix().get(3, 1), (actual).matrix().get(3, 1));
|
| - EXPECT_FLOAT_EQ((expected).matrix().get(0, 2), (actual).matrix().get(0, 2));
|
| - EXPECT_FLOAT_EQ((expected).matrix().get(1, 2), (actual).matrix().get(1, 2));
|
| - EXPECT_FLOAT_EQ((expected).matrix().get(2, 2), (actual).matrix().get(2, 2));
|
| - EXPECT_FLOAT_EQ((expected).matrix().get(3, 2), (actual).matrix().get(3, 2));
|
| - EXPECT_FLOAT_EQ((expected).matrix().get(0, 3), (actual).matrix().get(0, 3));
|
| - EXPECT_FLOAT_EQ((expected).matrix().get(1, 3), (actual).matrix().get(1, 3));
|
| - EXPECT_FLOAT_EQ((expected).matrix().get(2, 3), (actual).matrix().get(2, 3));
|
| - EXPECT_FLOAT_EQ((expected).matrix().get(3, 3), (actual).matrix().get(3, 3));
|
| + for (int row = 0; row < 4; ++row) {
|
| + for (int col = 0; col < 4; ++col) {
|
| + EXPECT_FLOAT_EQ(expected.matrix().get(row, col),
|
| + actual.matrix().get(row, col));
|
| + }
|
| + }
|
| +}
|
| +
|
| +void ExpectTransformationMatrixNear(const gfx::Transform& expected,
|
| + const gfx::Transform& actual,
|
| + float abs_error) {
|
| + for (int row = 0; row < 4; ++row) {
|
| + for (int col = 0; col < 4; ++col) {
|
| + EXPECT_NEAR(expected.matrix().get(row, col),
|
| + actual.matrix().get(row, col), abs_error);
|
| + }
|
| + }
|
| }
|
|
|
| gfx::Transform Inverse(const gfx::Transform& transform) {
|
|
|