Index: cc/test/CCGeometryTestUtils.h |
diff --git a/cc/test/CCGeometryTestUtils.h b/cc/test/CCGeometryTestUtils.h |
index 469666003fae53e014d8cc435a9bba2f19d7c8b3..713965b25a65debc48a9e95a66f41e8781fd55cd 100644 |
--- a/cc/test/CCGeometryTestUtils.h |
+++ b/cc/test/CCGeometryTestUtils.h |
@@ -1,42 +1,6 @@ |
-// Copyright 2011 The Chromium Authors. All rights reserved. |
+// Copyright 2012 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CCGeometryTestUtils_h |
-#define CCGeometryTestUtils_h |
- |
-namespace WebKit { |
-class WebTransformationMatrix; |
-} |
- |
-namespace WebKitTests { |
- |
-// These are macros instead of functions so that we get useful line numbers where a test failed. |
-#define EXPECT_FLOAT_RECT_EQ(expected, actual) \ |
- EXPECT_FLOAT_EQ((expected).location().x(), (actual).location().x()); \ |
- EXPECT_FLOAT_EQ((expected).location().y(), (actual).location().y()); \ |
- EXPECT_FLOAT_EQ((expected).size().width(), (actual).size().width()); \ |
- EXPECT_FLOAT_EQ((expected).size().height(), (actual).size().height()) |
- |
-#define EXPECT_RECT_EQ(expected, actual) \ |
- EXPECT_EQ((expected).location().x(), (actual).location().x()); \ |
- EXPECT_EQ((expected).location().y(), (actual).location().y()); \ |
- EXPECT_EQ((expected).size().width(), (actual).size().width()); \ |
- EXPECT_EQ((expected).size().height(), (actual).size().height()) |
- |
-// This is a function rather than a macro because when this is included as a macro |
-// in bulk, it causes a significant slow-down in compilation time. This problem |
-// exists with both gcc and clang, and bugs have been filed at |
-// http://llvm.org/bugs/show_bug.cgi?id=13651 and http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54337 |
-void ExpectTransformationMatrixEq(const WebKit::WebTransformationMatrix& expected, |
- const WebKit::WebTransformationMatrix& actual); |
- |
-#define EXPECT_TRANSFORMATION_MATRIX_EQ(expected, actual) \ |
- { \ |
- SCOPED_TRACE(""); \ |
- WebKitTests::ExpectTransformationMatrixEq(expected, actual); \ |
- } |
- |
-} // namespace WebKitTests |
- |
-#endif // CCGeometryTestUtils_h |
+// Temporary forwarding header |
+#include "cc/test/geometry_test_utils.h" |