| Index: cc/draw_quad_unittest.cc
|
| diff --git a/cc/draw_quad_unittest.cc b/cc/draw_quad_unittest.cc
|
| index 985f19076c8d82227f16d3c862231627b613e411..543ad7da73eee84c1ccac8c9f4d57d660b8bacd7 100644
|
| --- a/cc/draw_quad_unittest.cc
|
| +++ b/cc/draw_quad_unittest.cc
|
| @@ -336,22 +336,25 @@ TEST(DrawQuadTest, copyTextureDrawQuad)
|
| unsigned resourceId = 82;
|
| bool premultipliedAlpha = true;
|
| gfx::RectF uvRect(0.5, 224, -51, 36);
|
| + const float vertex_opacity[] = {1, 1, 1, 1};
|
| bool flipped = true;
|
| CREATE_SHARED_STATE();
|
|
|
| - CREATE_QUAD_5_NEW(TextureDrawQuad, opaqueRect, resourceId, premultipliedAlpha, uvRect, flipped);
|
| + CREATE_QUAD_6_NEW(TextureDrawQuad, opaqueRect, resourceId, premultipliedAlpha, uvRect, 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_FLOAT_ARRAY_EQ(vertex_opacity, copyQuad->vertex_opacity, 4);
|
| EXPECT_EQ(flipped, copyQuad->flipped);
|
|
|
| - CREATE_QUAD_4_ALL(TextureDrawQuad, resourceId, premultipliedAlpha, uvRect, flipped);
|
| + CREATE_QUAD_5_ALL(TextureDrawQuad, resourceId, premultipliedAlpha, uvRect, 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_FLOAT_ARRAY_EQ(vertex_opacity, copyQuad->vertex_opacity, 4);
|
| EXPECT_EQ(flipped, copyQuad->flipped);
|
| }
|
|
|
|
|