Index: cc/resources/picture_layer_tiling_set.cc |
diff --git a/cc/resources/picture_layer_tiling_set.cc b/cc/resources/picture_layer_tiling_set.cc |
index fe55d76ef133d9eb7af9acbced2105ac11dac5c0..44d766a839c8479cdc568dbdec6d1997eb6493b4 100644 |
--- a/cc/resources/picture_layer_tiling_set.cc |
+++ b/cc/resources/picture_layer_tiling_set.cc |
@@ -69,12 +69,8 @@ bool PictureLayerTilingSet::SyncTilings(const PictureLayerTilingSet& other, |
if (PictureLayerTiling* this_tiling = TilingAtScale(contents_scale)) { |
this_tiling->set_resolution(other.tilings_[i]->resolution()); |
- // These two calls must come before updating the pile, because they may |
- // destroy tiles that the new pile cannot raster. |
- this_tiling->SetLayerBounds(new_layer_bounds); |
- this_tiling->Invalidate(layer_invalidation); |
- |
- this_tiling->UpdateTilesToCurrentPile(); |
+ this_tiling->UpdateTilesToCurrentPile(layer_invalidation, |
+ new_layer_bounds); |
this_tiling->CreateMissingTilesInLiveTilesRect(); |
if (this_tiling->resolution() == HIGH_RESOLUTION) |
have_high_res_tiling = true; |
@@ -98,11 +94,6 @@ bool PictureLayerTilingSet::SyncTilings(const PictureLayerTilingSet& other, |
return have_high_res_tiling; |
} |
-void PictureLayerTilingSet::RemoveTilesInRegion(const Region& region) { |
- for (size_t i = 0; i < tilings_.size(); ++i) |
- tilings_[i]->RemoveTilesInRegion(region); |
-} |
- |
PictureLayerTiling* PictureLayerTilingSet::AddTiling(float contents_scale) { |
for (size_t i = 0; i < tilings_.size(); ++i) |
DCHECK_NE(tilings_[i]->contents_scale(), contents_scale); |