| Index: cc/draw_quad_unittest.cc
|
| diff --git a/cc/draw_quad_unittest.cc b/cc/draw_quad_unittest.cc
|
| index 0362418eea574b8a0ce32fb41cbe7577ab34cfcf..c2c8ed53a86f69cb8b38af577bb7aa43f42825cc 100644
|
| --- a/cc/draw_quad_unittest.cc
|
| +++ b/cc/draw_quad_unittest.cc
|
| @@ -362,25 +362,28 @@ TEST(DrawQuadTest, copyTextureDrawQuad)
|
| gfx::Rect opaqueRect(3, 7, 10, 12);
|
| unsigned resourceId = 82;
|
| bool premultipliedAlpha = true;
|
| - gfx::RectF uvRect(0.5f, 224.f, 51.f, 36.f);
|
| + gfx::PointF uvTopLeft(0.5f, 224.f);
|
| + gfx::PointF uvBottomRight(51.5f, 260.f);
|
| const float vertex_opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
|
| bool flipped = true;
|
| CREATE_SHARED_STATE();
|
|
|
| - CREATE_QUAD_6_NEW(TextureDrawQuad, opaqueRect, resourceId, premultipliedAlpha, uvRect, vertex_opacity, flipped);
|
| + CREATE_QUAD_7_NEW(TextureDrawQuad, opaqueRect, resourceId, premultipliedAlpha, uvTopLeft, uvBottomRight, vertex_opacity, flipped);
|
| EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copyQuad->material);
|
| EXPECT_RECT_EQ(opaqueRect, copyQuad->opaque_rect);
|
| EXPECT_EQ(resourceId, copyQuad->resource_id);
|
| EXPECT_EQ(premultipliedAlpha, copyQuad->premultiplied_alpha);
|
| - EXPECT_FLOAT_RECT_EQ(uvRect, copyQuad->uv_rect);
|
| + EXPECT_EQ(uvTopLeft, copyQuad->uv_top_left);
|
| + EXPECT_EQ(uvBottomRight, copyQuad->uv_bottom_right);
|
| EXPECT_FLOAT_ARRAY_EQ(vertex_opacity, copyQuad->vertex_opacity, 4);
|
| EXPECT_EQ(flipped, copyQuad->flipped);
|
|
|
| - CREATE_QUAD_5_ALL(TextureDrawQuad, resourceId, premultipliedAlpha, uvRect, vertex_opacity, flipped);
|
| + CREATE_QUAD_6_ALL(TextureDrawQuad, resourceId, premultipliedAlpha, uvTopLeft, uvBottomRight, vertex_opacity, flipped);
|
| EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copyQuad->material);
|
| EXPECT_EQ(resourceId, copyQuad->resource_id);
|
| EXPECT_EQ(premultipliedAlpha, copyQuad->premultiplied_alpha);
|
| - EXPECT_FLOAT_RECT_EQ(uvRect, copyQuad->uv_rect);
|
| + EXPECT_EQ(uvTopLeft, copyQuad->uv_top_left);
|
| + EXPECT_EQ(uvBottomRight, copyQuad->uv_bottom_right);
|
| EXPECT_FLOAT_ARRAY_EQ(vertex_opacity, copyQuad->vertex_opacity, 4);
|
| EXPECT_EQ(flipped, copyQuad->flipped);
|
| }
|
|
|