cc: Start using raster/eviction iterators.

cc/resources/picture_layer_tiling_set.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/picture_layer_tiling_set.h"
 
 #include <limits>
 
 namespace cc {
 
@@ skipping 57 matching lines @@
       continue;
     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->CreateMissingTilesInLiveTilesRect();
       if (this_tiling->resolution() == HIGH_RESOLUTION)
         have_high_res_tiling = true;
 
       DCHECK(this_tiling->tile_size() ==
              client_->CalculateTileSize(this_tiling->TilingRect().size()));
       continue;
     }
     scoped_ptr<PictureLayerTiling> new_tiling = PictureLayerTiling::Create(
         contents_scale,
         new_layer_bounds,
         client_);
     new_tiling->set_resolution(other.tilings_[i]->resolution());
     if (new_tiling->resolution() == HIGH_RESOLUTION)
       have_high_res_tiling = true;
     tilings_.push_back(new_tiling.Pass());
   }
   tilings_.sort(LargestToSmallestScaleFunctor());
 
   layer_bounds_ = new_layer_bounds;
   return have_high_res_tiling;
 }
 
 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) {
   for (size_t i = 0; i < tilings_.size(); ++i)
     DCHECK_NE(tilings_[i]->contents_scale(), contents_scale);
 
   tilings_.push_back(PictureLayerTiling::Create(contents_scale,
                                                 layer_bounds_,
                                                 client_));
   PictureLayerTiling* appended = tilings_.back();
@@ skipping 85 matching lines @@
     return gfx::RectF();
   return tiling_iter_.texture_rect();
 }
 
 gfx::Size PictureLayerTilingSet::CoverageIterator::texture_size() const {
   if (!tiling_iter_)
     return gfx::Size();
   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;
   return *tiling_iter_;
 }
 
 Tile* PictureLayerTilingSet::CoverageIterator::operator*() const {
   if (!tiling_iter_)
     return NULL;
   return *tiling_iter_;
@@ skipping 86 matching lines @@
 PictureLayerTilingSet::CoverageIterator::operator bool() const {
   return current_tiling_ < static_cast<int>(set_->tilings_.size()) ||
       region_iter_.has_rect();
 }
 
 void PictureLayerTilingSet::DidBecomeActive() {
   for (size_t i = 0; i < tilings_.size(); ++i)
     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)
     state->Append(tilings_[i]->AsValue().release());
   return state.PassAs<base::Value>();
 }
 
 size_t PictureLayerTilingSet::GPUMemoryUsageInBytes() const {
   size_t amount = 0;
   for (size_t i = 0; i < tilings_.size(); ++i)
     amount += tilings_[i]->GPUMemoryUsageInBytes();
   return amount;
 }
 
 }  // namespace cc