| Index: mojo/converters/surfaces/tests/surface_unittest.cc
|
| diff --git a/mojo/converters/surfaces/tests/surface_unittest.cc b/mojo/converters/surfaces/tests/surface_unittest.cc
|
| index 90aab3c580fef7508ac7ad1b5fdc40baf4f0f47d..30b18841cf0cc21b2fdf0db4943161682823cb49 100644
|
| --- a/mojo/converters/surfaces/tests/surface_unittest.cc
|
| +++ b/mojo/converters/surfaces/tests/surface_unittest.cc
|
| @@ -112,12 +112,10 @@ TEST_F(SurfaceLibQuadTest, TextureQuad) {
|
| float vertex_opacity[4] = {0.1f, 0.5f, 0.4f, 0.8f};
|
| bool y_flipped = false;
|
| bool nearest_neighbor = false;
|
| - bool allow_overlay = false;
|
| texture_quad->SetAll(sqs, rect, opaque_rect, visible_rect, needs_blending,
|
| - resource_id, gfx::Size(), allow_overlay,
|
| - premultiplied_alpha, uv_top_left, uv_bottom_right,
|
| - background_color, vertex_opacity, y_flipped,
|
| - nearest_neighbor);
|
| + resource_id, gfx::Size(), premultiplied_alpha,
|
| + uv_top_left, uv_bottom_right, background_color,
|
| + vertex_opacity, y_flipped, nearest_neighbor);
|
|
|
| QuadPtr mojo_quad = Quad::From<cc::DrawQuad>(*texture_quad);
|
| ASSERT_FALSE(mojo_quad.is_null());
|
| @@ -266,12 +264,10 @@ TEST(SurfaceLibTest, RenderPass) {
|
| float vertex_opacity[4] = {0.1f, 0.5f, 0.4f, 0.8f};
|
| bool y_flipped = false;
|
| bool nearest_neighbor = false;
|
| - bool allow_overlay = false;
|
| texture_quad->SetAll(sqs, rect, opaque_rect, visible_rect, needs_blending,
|
| - resource_id, gfx::Size(), allow_overlay,
|
| - premultiplied_alpha, uv_top_left, uv_bottom_right,
|
| - background_color, vertex_opacity, y_flipped,
|
| - nearest_neighbor);
|
| + resource_id, gfx::Size(), premultiplied_alpha,
|
| + uv_top_left, uv_bottom_right, background_color,
|
| + vertex_opacity, y_flipped, nearest_neighbor);
|
|
|
| PassPtr mojo_pass = Pass::From(*pass);
|
| ASSERT_FALSE(mojo_pass.is_null());
|
|
|