| 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 02c8e6cf0833a35d213b469d29aaeb33059de390..f2e3ef0e024be0bb903ac14765c6264599c47951 100644
|
| --- a/cc/layers/picture_layer_impl_unittest.cc
|
| +++ b/cc/layers/picture_layer_impl_unittest.cc
|
| @@ -486,8 +486,10 @@ TEST_F(PictureLayerImplTest, AddTilesFromNewRecording) {
|
| iter.full_tile_geometry_rect(), 1.f / tiling->contents_scale());
|
| layer_rect.Intersect(gfx::Rect(layer_bounds));
|
|
|
| - bool in_pending = pending_pile->recorded_region().Contains(layer_rect);
|
| - bool in_active = active_pile->recorded_region().Contains(layer_rect);
|
| + bool in_pending = pending_pile->CanRaster(tiling->contents_scale(),
|
| + iter.full_tile_geometry_rect());
|
| + bool in_active = active_pile->CanRaster(tiling->contents_scale(),
|
| + iter.full_tile_geometry_rect());
|
|
|
| if (in_pending && !in_active)
|
| EXPECT_EQ(pending_pile, iter->picture_pile());
|
| @@ -627,7 +629,7 @@ TEST_F(PictureLayerImplTest, CreateTilingsEvenIfTwinHasNone) {
|
| gfx::Size layer_bounds(1300, 1900);
|
|
|
| scoped_refptr<FakePicturePileImpl> empty_pile =
|
| - FakePicturePileImpl::CreateFilledPile(tile_size, gfx::Size(1000, 0));
|
| + FakePicturePileImpl::CreateEmptyPile(tile_size, layer_bounds);
|
| scoped_refptr<FakePicturePileImpl> valid_pile =
|
| FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
|
|
|
| @@ -1314,13 +1316,11 @@ TEST_F(PictureLayerImplTest, NothingRequiredIfActiveMissingTiles) {
|
| gfx::Size tile_size(100, 100);
|
| scoped_refptr<FakePicturePileImpl> pending_pile =
|
| FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
|
| - // An arbitrary bogus outside the layer recording. Enough for the layer to
|
| - // think it can create tiles, but not in bounds so all tiles are null.
|
| - Region active_recorded_region;
|
| - active_recorded_region.Union(gfx::Rect(1000, 1000, 1, 1));
|
| + // This pile will create tilings, but has no recordings so will
|
| + // not create any tiles.
|
| scoped_refptr<FakePicturePileImpl> active_pile =
|
| - FakePicturePileImpl::CreatePileWithRecordedRegion(
|
| - tile_size, layer_bounds, active_recorded_region);
|
| + FakePicturePileImpl::CreateEmptyPileThatThinksItHasTiles(tile_size,
|
| + layer_bounds);
|
| SetupTrees(pending_pile, active_pile);
|
| pending_layer_->set_fixed_tile_size(tile_size);
|
| active_layer_->set_fixed_tile_size(tile_size);
|
|
|