| Index: cc/output/renderer_pixeltest.cc
|
| diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc
|
| index 2377043d45a4deba2fb650805f40eb2c9ec2376a..cc88f06ed5f0a3c293cf3a2654b6b231716049e8 100644
|
| --- a/cc/output/renderer_pixeltest.cc
|
| +++ b/cc/output/renderer_pixeltest.cc
|
| @@ -103,12 +103,13 @@ scoped_ptr<DrawQuad> CreateTestRenderPassDrawQuad(
|
| rect,
|
| rect,
|
| pass_id,
|
| - false, // is_replica
|
| - 0, // mask_resource_id
|
| - rect, // contents_changed_since_last_frame
|
| - gfx::RectF(1.f, 1.f), // mask_uv_rect
|
| - FilterOperations(), // foreground filters
|
| - FilterOperations()); // background filters
|
| + false, // is_replica
|
| + 0, // mask_resource_id
|
| + rect, // contents_changed_since_last_frame
|
| + gfx::RectF(1.f, 1.f), // mask_uv_rect
|
| + FilterOperations(), // foreground filters
|
| + FilterOperations(), // background filters
|
| + gfx::Vector2dF(1.f, 1.f)); // scale
|
|
|
| return quad.PassAs<DrawQuad>();
|
| }
|
| @@ -834,7 +835,8 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlpha) {
|
| pass_rect,
|
| gfx::RectF(),
|
| filters,
|
| - FilterOperations());
|
| + FilterOperations(),
|
| + gfx::Vector2dF(1.f, 1.f));
|
|
|
| root_pass->quad_list.push_back(render_pass_quad.PassAs<DrawQuad>());
|
|
|
| @@ -909,7 +911,8 @@ TYPED_TEST(RendererPixelTest, FastPassSaturateFilter) {
|
| pass_rect,
|
| gfx::RectF(),
|
| filters,
|
| - FilterOperations());
|
| + FilterOperations(),
|
| + gfx::Vector2dF(1.f, 1.f));
|
|
|
| root_pass->quad_list.push_back(render_pass_quad.PassAs<DrawQuad>());
|
|
|
| @@ -983,7 +986,8 @@ TYPED_TEST(RendererPixelTest, FastPassFilterChain) {
|
| pass_rect,
|
| gfx::RectF(),
|
| filters,
|
| - FilterOperations());
|
| + FilterOperations(),
|
| + gfx::Vector2dF(1.f, 1.f)); // scale
|
|
|
| root_pass->quad_list.push_back(render_pass_quad.PassAs<DrawQuad>());
|
|
|
| @@ -1079,7 +1083,8 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlphaTranslation) {
|
| pass_rect,
|
| gfx::RectF(),
|
| filters,
|
| - FilterOperations());
|
| + FilterOperations(),
|
| + gfx::Vector2dF(1.f, 1.f)); // scale
|
|
|
| root_pass->quad_list.push_back(render_pass_quad.PassAs<DrawQuad>());
|
| RenderPassList pass_list;
|
| @@ -1289,7 +1294,9 @@ TYPED_TEST(RendererPixelTest, RenderPassAndMaskWithPartialQuad) {
|
| sub_rect, // contents_changed_since_last_frame
|
| gfx::RectF(1.f, 1.f), // mask_uv_rect
|
| FilterOperations(), // foreground filters
|
| - FilterOperations()); // background filters
|
| + FilterOperations(), // background filters
|
| + gfx::Vector2dF(1.f, 1.f)); // scale
|
| +
|
| root_pass->quad_list.push_back(mask_quad.PassAs<DrawQuad>());
|
|
|
| // White background behind the masked render pass.
|
| @@ -1364,7 +1371,9 @@ class RendererPixelTestWithBackgroundFilter
|
| filter_pass_content_rect_, // contents_changed_since_last_frame
|
| gfx::RectF(), // mask_uv_rect
|
| FilterOperations(), // filters
|
| - this->background_filters_);
|
| + this->background_filters_,
|
| + gfx::Vector2dF(1.f, 1.f)); // scale
|
| +
|
| root_pass->quad_list.push_back(filter_pass_quad.PassAs<DrawQuad>());
|
| }
|
|
|
|
|