| 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..2f9306150f32545ad67094d1256e2363f4893d4e 100644
|
| --- a/cc/resources/picture_layer_tiling_set.cc
|
| +++ b/cc/resources/picture_layer_tiling_set.cc
|
| @@ -75,7 +75,6 @@ bool PictureLayerTilingSet::SyncTilings(const PictureLayerTilingSet& other,
|
| this_tiling->Invalidate(layer_invalidation);
|
|
|
| this_tiling->UpdateTilesToCurrentPile();
|
| - this_tiling->CreateMissingTilesInLiveTilesRect();
|
| if (this_tiling->resolution() == HIGH_RESOLUTION)
|
| have_high_res_tiling = true;
|
|
|
| @@ -100,7 +99,7 @@ bool PictureLayerTilingSet::SyncTilings(const PictureLayerTilingSet& other,
|
|
|
| void PictureLayerTilingSet::RemoveTilesInRegion(const Region& region) {
|
| for (size_t i = 0; i < tilings_.size(); ++i)
|
| - tilings_[i]->RemoveTilesInRegion(region);
|
| + tilings_[i]->Invalidate(region);
|
| }
|
|
|
| PictureLayerTiling* PictureLayerTilingSet::AddTiling(float contents_scale) {
|
| @@ -206,6 +205,14 @@ gfx::Size PictureLayerTilingSet::CoverageIterator::texture_size() const {
|
| return tiling_iter_.texture_size();
|
| }
|
|
|
| +TileResolution PictureLayerTilingSet::CoverageIterator::resolution() {
|
| + PictureLayerTiling* tiling = CurrentTiling();
|
| + if (tiling)
|
| + return tiling->resolution();
|
| + NOTREACHED();
|
| + return NON_IDEAL_RESOLUTION;
|
| +}
|
| +
|
| Tile* PictureLayerTilingSet::CoverageIterator::operator->() const {
|
| if (!tiling_iter_)
|
| return NULL;
|
| @@ -312,11 +319,6 @@ void PictureLayerTilingSet::DidBecomeActive() {
|
| tilings_[i]->DidBecomeActive();
|
| }
|
|
|
| -void PictureLayerTilingSet::DidBecomeRecycled() {
|
| - for (size_t i = 0; i < tilings_.size(); ++i)
|
| - tilings_[i]->DidBecomeRecycled();
|
| -}
|
| -
|
| scoped_ptr<base::Value> PictureLayerTilingSet::AsValue() const {
|
| scoped_ptr<base::ListValue> state(new base::ListValue());
|
| for (size_t i = 0; i < tilings_.size(); ++i)
|
|
|