cc: Use gfx:: Geometry types for positions, bounds, and related things.

cc/math_util_unittest.cc

 // 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.
 
 #include "config.h"
 
 #include "cc/math_util.h"
 
-#include "FloatRect.h"
 #include "cc/test/geometry_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/rect.h"
+#include "ui/gfx/rect_f.h"
 #include <public/WebTransformationMatrix.h>
 
 using namespace cc;
 using WebKit::WebTransformationMatrix;
 
 namespace {
 
 TEST(MathUtilTest, verifyBackfaceVisibilityBasicCases)
 {
     WebTransformationMatrix transform;
@@ skipping 60 matching lines @@
 
 TEST(MathUtilTest, verifyProjectionOfPerpendicularPlane)
 {
     // In this case, the m33() element of the transform becomes zero, which could cause a
     // divide-by-zero when projecting points/quads.
 
     WebTransformationMatrix transform;
     transform.makeIdentity();
     transform.setM33(0);
 
-    FloatRect rect = FloatRect(0, 0, 1, 1);
-    FloatRect projectedRect = MathUtil::projectClippedRect(transform, rect);
+    gfx::RectF rect = gfx::RectF(0, 0, 1, 1);
+    gfx::RectF projectedRect = MathUtil::projectClippedRect(transform, rect);
 
     EXPECT_EQ(0, projectedRect.x());
     EXPECT_EQ(0, projectedRect.y());
-    EXPECT_TRUE(projectedRect.isEmpty());
+    EXPECT_TRUE(projectedRect.IsEmpty());
 }
 
 TEST(MathUtilTest, verifyEnclosingClippedRectUsesCorrectInitialBounds)
 {
     HomogeneousCoordinate h1(-100, -100, 0, 1);
     HomogeneousCoordinate h2(-10, -10, 0, 1);
     HomogeneousCoordinate h3(10, 10, 0, -1);
     HomogeneousCoordinate h4(100, 100, 0, -1);
 
     // The bounds of the enclosing clipped rect should be -100 to -10 for both x and y.
     // However, if there is a bug where the initial xmin/xmax/ymin/ymax are initialized to
     // numeric_limits<float>::min() (which is zero, not -flt_max) then the enclosing
     // clipped rect will be computed incorrectly.
-    FloatRect result = MathUtil::computeEnclosingClippedRect(h1, h2, h3, h4);
+    gfx::RectF result = MathUtil::computeEnclosingClippedRect(h1, h2, h3, h4);
 
-    EXPECT_FLOAT_RECT_EQ(FloatRect(FloatPoint(-100, -100), FloatSize(90, 90)), result);
+    EXPECT_FLOAT_RECT_EQ(gfx::RectF(gfx::PointF(-100, -100), gfx::SizeF(90, 90)), result);
 }
 
 TEST(MathUtilTest, verifyEnclosingRectOfVerticesUsesCorrectInitialBounds)
 {
-    FloatPoint vertices[3];
+    gfx::PointF vertices[3];
     int numVertices = 3;
 
-    vertices[0] = FloatPoint(-10, -100);
-    vertices[1] = FloatPoint(-100, -10);
-    vertices[2] = FloatPoint(-30, -30);
+    vertices[0] = gfx::PointF(-10, -100);
+    vertices[1] = gfx::PointF(-100, -10);
+    vertices[2] = gfx::PointF(-30, -30);
 
     // The bounds of the enclosing rect should be -100 to -10 for both x and y. However,
     // if there is a bug where the initial xmin/xmax/ymin/ymax are initialized to
     // numeric_limits<float>::min() (which is zero, not -flt_max) then the enclosing
     // clipped rect will be computed incorrectly.
-    FloatRect result = MathUtil::computeEnclosingRectOfVertices(vertices, numVertices);
+    gfx::RectF result = MathUtil::computeEnclosingRectOfVertices(vertices, numVertices);
 
-    EXPECT_FLOAT_RECT_EQ(FloatRect(FloatPoint(-100, -100), FloatSize(90, 90)), result);
+    EXPECT_FLOAT_RECT_EQ(gfx::RectF(gfx::PointF(-100, -100), gfx::SizeF(90, 90)), result);
 }
 
 TEST(MathUtilTest, smallestAngleBetweenVectors)
 {
     FloatSize x(1, 0);
     FloatSize y(0, 1);
     FloatSize testVector(0.5, 0.5);
 
     // Orthogonal vectors are at an angle of 90 degress.
     EXPECT_EQ(90, MathUtil::smallestAngleBetweenVectors(x, y));
@@ skipping 30 matching lines @@
 
     // Finally check than an arbitrary vector projected to another one gives a vector parallel to
     // the second vector.
     FloatSize targetVector(0.5, 0.2f);
     FloatSize projectedVector = MathUtil::projectVector(testVector, targetVector);
     EXPECT_EQ(projectedVector.width() / targetVector.width(),
               projectedVector.height() / targetVector.height());
 }
 
 } // namespace