| Index: cc/quads/draw_quad_unittest.cc
|
| diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc
|
| index d55bfa52ac2d21b0c00b1dfcc89730b824fbd224..36a16d36fc9dcdc0823b32375cfc26cbda651cc7 100644
|
| --- a/cc/quads/draw_quad_unittest.cc
|
| +++ b/cc/quads/draw_quad_unittest.cc
|
| @@ -551,7 +551,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
|
| gfx::PointF uv_top_left(0.5f, 224.f);
|
| gfx::PointF uv_bottom_right(51.5f, 260.f);
|
| const float vertex_opacity[] = { 1.0f, 1.0f, 1.0f, 1.0f };
|
| - bool flipped = true;
|
| + bool y_flipped = true;
|
| bool nearest_neighbor = true;
|
| CREATE_SHARED_STATE();
|
|
|
| @@ -564,7 +564,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
|
| uv_bottom_right,
|
| SK_ColorTRANSPARENT,
|
| vertex_opacity,
|
| - flipped,
|
| + y_flipped,
|
| nearest_neighbor);
|
| EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copy_quad->material);
|
| EXPECT_EQ(visible_rect, copy_quad->visible_rect);
|
| @@ -574,7 +574,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
|
| EXPECT_EQ(uv_top_left, copy_quad->uv_top_left);
|
| EXPECT_EQ(uv_bottom_right, copy_quad->uv_bottom_right);
|
| EXPECT_FLOAT_ARRAY_EQ(vertex_opacity, copy_quad->vertex_opacity, 4);
|
| - EXPECT_EQ(flipped, copy_quad->flipped);
|
| + EXPECT_EQ(y_flipped, copy_quad->y_flipped);
|
| EXPECT_EQ(nearest_neighbor, copy_quad->nearest_neighbor);
|
|
|
| CREATE_QUAD_8_ALL(TextureDrawQuad,
|
| @@ -584,7 +584,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
|
| uv_bottom_right,
|
| SK_ColorTRANSPARENT,
|
| vertex_opacity,
|
| - flipped,
|
| + y_flipped,
|
| nearest_neighbor);
|
| EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copy_quad->material);
|
| EXPECT_EQ(resource_id, copy_quad->resource_id);
|
| @@ -592,7 +592,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
|
| EXPECT_EQ(uv_top_left, copy_quad->uv_top_left);
|
| EXPECT_EQ(uv_bottom_right, copy_quad->uv_bottom_right);
|
| EXPECT_FLOAT_ARRAY_EQ(vertex_opacity, copy_quad->vertex_opacity, 4);
|
| - EXPECT_EQ(flipped, copy_quad->flipped);
|
| + EXPECT_EQ(y_flipped, copy_quad->y_flipped);
|
| EXPECT_EQ(nearest_neighbor, copy_quad->nearest_neighbor);
|
| }
|
|
|
| @@ -855,7 +855,7 @@ TEST_F(DrawQuadIteratorTest, TextureDrawQuad) {
|
| gfx::PointF uv_top_left(0.5f, 224.f);
|
| gfx::PointF uv_bottom_right(51.5f, 260.f);
|
| const float vertex_opacity[] = { 1.0f, 1.0f, 1.0f, 1.0f };
|
| - bool flipped = true;
|
| + bool y_flipped = true;
|
| bool nearest_neighbor = true;
|
|
|
| CREATE_SHARED_STATE();
|
| @@ -868,7 +868,7 @@ TEST_F(DrawQuadIteratorTest, TextureDrawQuad) {
|
| uv_bottom_right,
|
| SK_ColorTRANSPARENT,
|
| vertex_opacity,
|
| - flipped,
|
| + y_flipped,
|
| nearest_neighbor);
|
| EXPECT_EQ(resource_id, quad_new->resource_id);
|
| EXPECT_EQ(1, IterateAndCount(quad_new));
|
|
|