| Index: cc/layers/picture_layer_impl_unittest.cc
|
| diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
|
| index 4b42eca413fbebecc04debfb077c9becb9fd2ed4..ac93d10ebcf14931d28c3662442f145e471a2a1f 100644
|
| --- a/cc/layers/picture_layer_impl_unittest.cc
|
| +++ b/cc/layers/picture_layer_impl_unittest.cc
|
| @@ -4497,21 +4497,13 @@ void PictureLayerImplTest::TestQuadsForSolidColor(bool test_for_solid) {
|
| host_impl_.SetViewportSize(layer_bounds);
|
|
|
| int frame_number = 0;
|
| - FakeRenderingStatsInstrumentation stats_instrumentation;
|
|
|
| client.set_fill_with_nonsolid_color(!test_for_solid);
|
|
|
| Region invalidation(layer_rect);
|
| - pile->UpdateAndExpandInvalidation(&client,
|
| - &invalidation,
|
| - SK_ColorWHITE,
|
| - false,
|
| - false,
|
| - layer_bounds,
|
| - layer_rect,
|
| - frame_number++,
|
| - Picture::RECORD_NORMALLY,
|
| - &stats_instrumentation);
|
| + pile->UpdateAndExpandInvalidation(&client, &invalidation, SK_ColorWHITE,
|
| + false, false, layer_bounds, layer_rect,
|
| + frame_number++, Picture::RECORD_NORMALLY);
|
|
|
| scoped_refptr<PicturePileImpl> pending_pile =
|
| PicturePileImpl::CreateFromOther(pile);
|
| @@ -4572,21 +4564,13 @@ TEST_F(PictureLayerImplTest, NonSolidToSolidNoTilings) {
|
| host_impl_.SetViewportSize(layer_bounds);
|
|
|
| int frame_number = 0;
|
| - FakeRenderingStatsInstrumentation stats_instrumentation;
|
|
|
| client.set_fill_with_nonsolid_color(true);
|
|
|
| Region invalidation1(layer_rect);
|
| - pile->UpdateAndExpandInvalidation(&client,
|
| - &invalidation1,
|
| - SK_ColorWHITE,
|
| - false,
|
| - false,
|
| - layer_bounds,
|
| - layer_rect,
|
| - frame_number++,
|
| - Picture::RECORD_NORMALLY,
|
| - &stats_instrumentation);
|
| + pile->UpdateAndExpandInvalidation(&client, &invalidation1, SK_ColorWHITE,
|
| + false, false, layer_bounds, layer_rect,
|
| + frame_number++, Picture::RECORD_NORMALLY);
|
|
|
| scoped_refptr<PicturePileImpl> pending_pile1 =
|
| PicturePileImpl::CreateFromOther(pile);
|
| @@ -4602,16 +4586,9 @@ TEST_F(PictureLayerImplTest, NonSolidToSolidNoTilings) {
|
| client.set_fill_with_nonsolid_color(false);
|
|
|
| Region invalidation2(layer_rect);
|
| - pile->UpdateAndExpandInvalidation(&client,
|
| - &invalidation2,
|
| - SK_ColorWHITE,
|
| - false,
|
| - false,
|
| - layer_bounds,
|
| - layer_rect,
|
| - frame_number++,
|
| - Picture::RECORD_NORMALLY,
|
| - &stats_instrumentation);
|
| + pile->UpdateAndExpandInvalidation(&client, &invalidation2, SK_ColorWHITE,
|
| + false, false, layer_bounds, layer_rect,
|
| + frame_number++, Picture::RECORD_NORMALLY);
|
|
|
| scoped_refptr<PicturePileImpl> pending_pile2 =
|
| PicturePileImpl::CreateFromOther(pile);
|
|
|