| Index: cc/layer_quad_unittest.cc
|
| diff --git a/cc/layer_quad_unittest.cc b/cc/layer_quad_unittest.cc
|
| index 8aa9adb61cf01f7b9acc712eaffd306bf003160d..23b0d0978e523a06b146877b1317d2fcb548e3bd 100644
|
| --- a/cc/layer_quad_unittest.cc
|
| +++ b/cc/layer_quad_unittest.cc
|
| @@ -7,25 +7,26 @@
|
| #include "cc/layer_quad.h"
|
|
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| +#include "ui/gfx/quad_f.h"
|
|
|
| using namespace cc;
|
|
|
| namespace {
|
|
|
| -TEST(LayerQuadTest, FloatQuadConversion)
|
| +TEST(LayerQuadTest, QuadFConversion)
|
| {
|
| gfx::PointF p1(-0.5, -0.5);
|
| gfx::PointF p2( 0.5, -0.5);
|
| gfx::PointF p3( 0.5, 0.5);
|
| gfx::PointF p4(-0.5, 0.5);
|
|
|
| - FloatQuad quadCW(p1, p2, p3, p4);
|
| + gfx::QuadF quadCW(p1, p2, p3, p4);
|
| LayerQuad layerQuadCW(quadCW);
|
| - EXPECT_TRUE(layerQuadCW.floatQuad() == quadCW);
|
| + EXPECT_TRUE(layerQuadCW.ToQuadF() == quadCW);
|
|
|
| - FloatQuad quadCCW(p1, p4, p3, p2);
|
| + gfx::QuadF quadCCW(p1, p4, p3, p2);
|
| LayerQuad layerQuadCCW(quadCCW);
|
| - EXPECT_TRUE(layerQuadCCW.floatQuad() == quadCCW);
|
| + EXPECT_TRUE(layerQuadCCW.ToQuadF() == quadCCW);
|
| }
|
|
|
| TEST(LayerQuadTest, Inflate)
|
| @@ -35,11 +36,11 @@ TEST(LayerQuadTest, Inflate)
|
| gfx::PointF p3( 0.5, 0.5);
|
| gfx::PointF p4(-0.5, 0.5);
|
|
|
| - FloatQuad quad(p1, p2, p3, p4);
|
| + gfx::QuadF quad(p1, p2, p3, p4);
|
| LayerQuad layerQuad(quad);
|
| - quad.scale(2, 2);
|
| + quad.Scale(2, 2);
|
| layerQuad.inflate(0.5);
|
| - EXPECT_TRUE(layerQuad.floatQuad() == quad);
|
| + EXPECT_TRUE(layerQuad.ToQuadF() == quad);
|
| }
|
|
|
| } // namespace
|
|
|