Index: cc/test/geometry_test_utils.cc |
diff --git a/cc/test/geometry_test_utils.cc b/cc/test/geometry_test_utils.cc |
index 68afd4b0e5e64191153369b3c4446daa530d1323..149735897e324f82e2e6a5a3bd5b73b96c2cea75 100644 |
--- a/cc/test/geometry_test_utils.cc |
+++ b/cc/test/geometry_test_utils.cc |
@@ -4,9 +4,11 @@ |
#include "cc/test/geometry_test_utils.h" |
-#include "testing/gtest/include/gtest/gtest.h" |
#include <public/WebTransformationMatrix.h> |
+#include "testing/gtest/include/gtest/gtest.h" |
+#include "ui/gfx/transform.h" |
+ |
namespace WebKitTests { |
void ExpectTransformationMatrixEq(const WebKit::WebTransformationMatrix& expected, |
@@ -30,4 +32,25 @@ void ExpectTransformationMatrixEq(const WebKit::WebTransformationMatrix& expecte |
EXPECT_FLOAT_EQ((expected).m44(), (actual).m44()); |
} |
+void ExpectTransformationMatrixEq(const gfx::Transform& expected, |
+ const gfx::Transform& actual) |
+{ |
+ EXPECT_FLOAT_EQ((expected).matrix().getDouble(0, 0), (actual).matrix().getDouble(0, 0)); |
danakj
2012/11/24 02:34:54
Use EXPECT_DOUBLE_EQ
shawnsingh
2012/11/24 02:56:14
I'll give it a try, but we might not be able to do
danakj
2012/11/24 03:20:09
I see. If it's a problem, keeping it as it has bee
|
+ EXPECT_FLOAT_EQ((expected).matrix().getDouble(1, 0), (actual).matrix().getDouble(1, 0)); |
+ EXPECT_FLOAT_EQ((expected).matrix().getDouble(2, 0), (actual).matrix().getDouble(2, 0)); |
+ EXPECT_FLOAT_EQ((expected).matrix().getDouble(3, 0), (actual).matrix().getDouble(3, 0)); |
+ EXPECT_FLOAT_EQ((expected).matrix().getDouble(0, 1), (actual).matrix().getDouble(0, 1)); |
+ EXPECT_FLOAT_EQ((expected).matrix().getDouble(1, 1), (actual).matrix().getDouble(1, 1)); |
+ EXPECT_FLOAT_EQ((expected).matrix().getDouble(2, 1), (actual).matrix().getDouble(2, 1)); |
+ EXPECT_FLOAT_EQ((expected).matrix().getDouble(3, 1), (actual).matrix().getDouble(3, 1)); |
+ EXPECT_FLOAT_EQ((expected).matrix().getDouble(0, 2), (actual).matrix().getDouble(0, 2)); |
+ EXPECT_FLOAT_EQ((expected).matrix().getDouble(1, 2), (actual).matrix().getDouble(1, 2)); |
+ EXPECT_FLOAT_EQ((expected).matrix().getDouble(2, 2), (actual).matrix().getDouble(2, 2)); |
+ EXPECT_FLOAT_EQ((expected).matrix().getDouble(3, 2), (actual).matrix().getDouble(3, 2)); |
+ EXPECT_FLOAT_EQ((expected).matrix().getDouble(0, 3), (actual).matrix().getDouble(0, 3)); |
+ EXPECT_FLOAT_EQ((expected).matrix().getDouble(1, 3), (actual).matrix().getDouble(1, 3)); |
+ EXPECT_FLOAT_EQ((expected).matrix().getDouble(2, 3), (actual).matrix().getDouble(2, 3)); |
+ EXPECT_FLOAT_EQ((expected).matrix().getDouble(3, 3), (actual).matrix().getDouble(3, 3)); |
+} |
+ |
} // namespace WebKitTests |