Rolls cc and webkit_compositor up to 127340

cc/test/CCGeometryTestUtils.h

Index: cc/test/CCGeometryTestUtils.h
diff --git a/cc/test/CCLayerTreeTestCommon.h b/cc/test/CCGeometryTestUtils.h
similarity index 79%
copy from cc/test/CCLayerTreeTestCommon.h
copy to cc/test/CCGeometryTestUtils.h
index 1e9a4735f45ce7b324e5542cd06d493f33631f98..469666003fae53e014d8cc435a9bba2f19d7c8b3 100644
--- a/cc/test/CCLayerTreeTestCommon.h
+++ b/cc/test/CCGeometryTestUtils.h
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CCLayerTreeTestCommon_h
-#define CCLayerTreeTestCommon_h
+#ifndef CCGeometryTestUtils_h
+#define CCGeometryTestUtils_h
 
-#include <public/WebTransformationMatrix.h>
+namespace WebKit {
+class WebTransformationMatrix;
+}
 
 namespace WebKitTests {
 
@@ -16,7 +18,7 @@ namespace WebKitTests {
     EXPECT_FLOAT_EQ((expected).size().width(), (actual).size().width()); \
     EXPECT_FLOAT_EQ((expected).size().height(), (actual).size().height())
 
-#define EXPECT_INT_RECT_EQ(expected, actual)                            \
+#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());      \
@@ -26,8 +28,8 @@ namespace WebKitTests {
 // 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(WebKit::WebTransformationMatrix expected,
-                                  WebKit::WebTransformationMatrix actual);
+void ExpectTransformationMatrixEq(const WebKit::WebTransformationMatrix& expected,
+                                  const WebKit::WebTransformationMatrix& actual);
 
 #define EXPECT_TRANSFORMATION_MATRIX_EQ(expected, actual)            \
     {                                                                \
@@ -35,6 +37,6 @@ void ExpectTransformationMatrixEq(WebKit::WebTransformationMatrix expected,
         WebKitTests::ExpectTransformationMatrixEq(expected, actual); \
     }
 
-} // namespace
+} // namespace WebKitTests
 
-#endif // CCLayerTreeTestCommon_h
+#endif // CCGeometryTestUtils_h