diff options
Diffstat (limited to 'cc/float_quad_unittest.cc')
| -rw-r--r-- | cc/float_quad_unittest.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cc/float_quad_unittest.cc b/cc/float_quad_unittest.cc index d4a4976..ebcdc28 100644 --- a/cc/float_quad_unittest.cc +++ b/cc/float_quad_unittest.cc @@ -4,10 +4,10 @@ #include "config.h" -#include "FloatQuad.h" #include "cc/math_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/rect_f.h" +#include "ui/gfx/quad_f.h" #include <public/WebTransformationMatrix.h> using namespace cc; @@ -15,6 +15,7 @@ using WebKit::WebTransformationMatrix; namespace { +// TODO(danakj) Move this test to ui/gfx/ when we don't use WebTransformationMatrix. TEST(FloatQuadTest, IsRectilinearTest) { const int numRectilinear = 8; @@ -31,9 +32,9 @@ TEST(FloatQuadTest, IsRectilinearTest) for (int i = 0; i < numRectilinear; ++i) { bool clipped = false; - FloatQuad quad = MathUtil::mapQuad(rectilinearTrans[i], gfx::RectF(0.01010101f, 0.01010101f, 100.01010101f, 100.01010101f), clipped); + gfx::QuadF quad = MathUtil::mapQuad(rectilinearTrans[i], gfx::QuadF(gfx::RectF(0.01010101f, 0.01010101f, 100.01010101f, 100.01010101f)), clipped); ASSERT_TRUE(!clipped); - EXPECT_TRUE(quad.isRectilinear()); + EXPECT_TRUE(quad.IsRectilinear()); } const int numNonRectilinear = 10; @@ -51,9 +52,9 @@ TEST(FloatQuadTest, IsRectilinearTest) for (int i = 0; i < numNonRectilinear; ++i) { bool clipped = false; - FloatQuad quad = MathUtil::mapQuad(nonRectilinearTrans[i], gfx::RectF(0.01010101f, 0.01010101f, 100.01010101f, 100.01010101f), clipped); + gfx::QuadF quad = MathUtil::mapQuad(nonRectilinearTrans[i], gfx::QuadF(gfx::RectF(0.01010101f, 0.01010101f, 100.01010101f, 100.01010101f)), clipped); ASSERT_TRUE(!clipped); - EXPECT_FALSE(quad.isRectilinear()); + EXPECT_FALSE(quad.IsRectilinear()); } } |