| Index: ui/gfx/point_unittest.cc
|
| diff --git a/ui/gfx/point_unittest.cc b/ui/gfx/point_unittest.cc
|
| index e35462f9a87df7fe5bf2324f44e9f602fbb2dca8..6cf73dd2adb5159534bba1cf988f10e2f959f71b 100644
|
| --- a/ui/gfx/point_unittest.cc
|
| +++ b/ui/gfx/point_unittest.cc
|
| @@ -124,24 +124,24 @@ TEST(PointTest, ClampPoint) {
|
|
|
| a = Point(3, 5);
|
| EXPECT_EQ(Point(3, 5).ToString(), a.ToString());
|
| - a.ClampToMin(Point(2, 4));
|
| + a.SetToMax(Point(2, 4));
|
| EXPECT_EQ(Point(3, 5).ToString(), a.ToString());
|
| - a.ClampToMin(Point(3, 5));
|
| + a.SetToMax(Point(3, 5));
|
| EXPECT_EQ(Point(3, 5).ToString(), a.ToString());
|
| - a.ClampToMin(Point(4, 2));
|
| + a.SetToMax(Point(4, 2));
|
| EXPECT_EQ(Point(4, 5).ToString(), a.ToString());
|
| - a.ClampToMin(Point(8, 10));
|
| + a.SetToMax(Point(8, 10));
|
| EXPECT_EQ(Point(8, 10).ToString(), a.ToString());
|
|
|
| - a.ClampToMax(Point(9, 11));
|
| + a.SetToMin(Point(9, 11));
|
| EXPECT_EQ(Point(8, 10).ToString(), a.ToString());
|
| - a.ClampToMax(Point(8, 10));
|
| + a.SetToMin(Point(8, 10));
|
| EXPECT_EQ(Point(8, 10).ToString(), a.ToString());
|
| - a.ClampToMax(Point(11, 9));
|
| + a.SetToMin(Point(11, 9));
|
| EXPECT_EQ(Point(8, 9).ToString(), a.ToString());
|
| - a.ClampToMax(Point(7, 11));
|
| + a.SetToMin(Point(7, 11));
|
| EXPECT_EQ(Point(7, 9).ToString(), a.ToString());
|
| - a.ClampToMax(Point(3, 5));
|
| + a.SetToMin(Point(3, 5));
|
| EXPECT_EQ(Point(3, 5).ToString(), a.ToString());
|
| }
|
|
|
| @@ -150,24 +150,24 @@ TEST(PointTest, ClampPointF) {
|
|
|
| a = PointF(3.5f, 5.5f);
|
| EXPECT_EQ(PointF(3.5f, 5.5f).ToString(), a.ToString());
|
| - a.ClampToMin(PointF(2.5f, 4.5f));
|
| + a.SetToMax(PointF(2.5f, 4.5f));
|
| EXPECT_EQ(PointF(3.5f, 5.5f).ToString(), a.ToString());
|
| - a.ClampToMin(PointF(3.5f, 5.5f));
|
| + a.SetToMax(PointF(3.5f, 5.5f));
|
| EXPECT_EQ(PointF(3.5f, 5.5f).ToString(), a.ToString());
|
| - a.ClampToMin(PointF(4.5f, 2.5f));
|
| + a.SetToMax(PointF(4.5f, 2.5f));
|
| EXPECT_EQ(PointF(4.5f, 5.5f).ToString(), a.ToString());
|
| - a.ClampToMin(PointF(8.5f, 10.5f));
|
| + a.SetToMax(PointF(8.5f, 10.5f));
|
| EXPECT_EQ(PointF(8.5f, 10.5f).ToString(), a.ToString());
|
|
|
| - a.ClampToMax(PointF(9.5f, 11.5f));
|
| + a.SetToMin(PointF(9.5f, 11.5f));
|
| EXPECT_EQ(PointF(8.5f, 10.5f).ToString(), a.ToString());
|
| - a.ClampToMax(PointF(8.5f, 10.5f));
|
| + a.SetToMin(PointF(8.5f, 10.5f));
|
| EXPECT_EQ(PointF(8.5f, 10.5f).ToString(), a.ToString());
|
| - a.ClampToMax(PointF(11.5f, 9.5f));
|
| + a.SetToMin(PointF(11.5f, 9.5f));
|
| EXPECT_EQ(PointF(8.5f, 9.5f).ToString(), a.ToString());
|
| - a.ClampToMax(PointF(7.5f, 11.5f));
|
| + a.SetToMin(PointF(7.5f, 11.5f));
|
| EXPECT_EQ(PointF(7.5f, 9.5f).ToString(), a.ToString());
|
| - a.ClampToMax(PointF(3.5f, 5.5f));
|
| + a.SetToMin(PointF(3.5f, 5.5f));
|
| EXPECT_EQ(PointF(3.5f, 5.5f).ToString(), a.ToString());
|
| }
|
|
|
|
|