cc: Start using raster/eviction iterators in tile manager

cc/resources/tile_manager.h

 // 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.
 
 #ifndef CC_RESOURCES_TILE_MANAGER_H_
 #define CC_RESOURCES_TILE_MANAGER_H_
 
 #include <deque>
 #include <queue>
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "cc/base/ref_counted_managed.h"
 #include "cc/debug/rendering_stats_instrumentation.h"
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/resources/managed_tile_state.h"
 #include "cc/resources/memory_history.h"
 #include "cc/resources/picture_pile_impl.h"
-#include "cc/resources/prioritized_tile_set.h"
 #include "cc/resources/rasterizer.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/tile.h"
 
 namespace cc {
 class RasterizerDelegate;
 class ResourceProvider;
 
 class CC_EXPORT TileManagerClient {
  public:
@@ skipping 23 matching lines @@
     PairedPictureLayer();
     ~PairedPictureLayer();
 
     PictureLayerImpl* active_layer;
     PictureLayerImpl* pending_layer;
   };
 
   class CC_EXPORT RasterTileIterator {
    public:
     RasterTileIterator(TileManager* tile_manager, TreePriority tree_priority);
+    RasterTileIterator(const RasterTileIterator& other);
     ~RasterTileIterator();
 
     RasterTileIterator& operator++();
     operator bool() const;
     Tile* operator*();
+    RasterTileIterator& operator=(const RasterTileIterator& other);
+
+    bool HasTilesRequiredForActivation() const;
 
    private:
     struct PairedPictureLayerIterator {
       PairedPictureLayerIterator();
       ~PairedPictureLayerIterator();
 
       Tile* PeekTile(TreePriority tree_priority);
       void PopTile(TreePriority tree_priority);
 
       std::pair<PictureLayerImpl::LayerRasterTileIterator*, WhichTree>
@@ skipping 18 matching lines @@
 
     std::vector<PairedPictureLayerIterator> paired_iterators_;
     std::vector<PairedPictureLayerIterator*> iterator_heap_;
     TreePriority tree_priority_;
     RasterOrderComparator comparator_;
   };
 
   struct CC_EXPORT EvictionTileIterator {
    public:
     EvictionTileIterator();
+    EvictionTileIterator(const EvictionTileIterator& other);
     EvictionTileIterator(TileManager* tile_manager, TreePriority tree_priority);
     ~EvictionTileIterator();
 
     EvictionTileIterator& operator++();
-    operator bool() const;
+    operator bool();
     Tile* operator*();
+    EvictionTileIterator& operator=(const EvictionTileIterator& other);
 
    private:
     struct PairedPictureLayerIterator {
       PairedPictureLayerIterator();
       ~PairedPictureLayerIterator();
 
       Tile* PeekTile(TreePriority tree_priority);
       void PopTile(TreePriority tree_priority);
 
       PictureLayerImpl::LayerEvictionTileIterator* NextTileIterator(
           TreePriority tree_priority);
 
       PictureLayerImpl::LayerEvictionTileIterator active_iterator;
       PictureLayerImpl::LayerEvictionTileIterator pending_iterator;
 
       std::vector<Tile*> returned_shared_tiles;
     };
 
     class EvictionOrderComparator {
      public:
       explicit EvictionOrderComparator(TreePriority tree_priority);
 
       bool operator()(PairedPictureLayerIterator* a,
                       PairedPictureLayerIterator* b) const;
 
      private:
       TreePriority tree_priority_;
     };
 
+    void Initialize();
+
+    bool initialized_;
+    TileManager* tile_manager_;
     std::vector<PairedPictureLayerIterator> paired_iterators_;
     std::vector<PairedPictureLayerIterator*> iterator_heap_;
     TreePriority tree_priority_;
     EvictionOrderComparator comparator_;
   };
 
   static scoped_ptr<TileManager> Create(
       TileManagerClient* client,
       ResourcePool* resource_pool,
       Rasterizer* rasterizer,
@@ skipping 52 matching lines @@
       for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) {
         FreeResourceForTile(tile, static_cast<RasterMode>(mode));
       }
     }
   }
 
   void SetGlobalStateForTesting(
       const GlobalStateThatImpactsTilePriority& state) {
     // Soft limit is used for resource pool such that
     // memory returns to soft limit after going over.
-    if (state != global_state_) {
-      global_state_ = state;
-      prioritized_tiles_dirty_ = true;
-    }
+    global_state_ = state;
   }
 
  protected:
   TileManager(TileManagerClient* client,
               ResourcePool* resource_pool,
               Rasterizer* rasterizer,
               Rasterizer* gpu_rasterizer,
               size_t max_raster_usage_bytes,
               bool use_rasterize_on_demand,
               RenderingStatsInstrumentation* rendering_stats_instrumentation);
 
-  // Methods called by Tile
-  friend class Tile;
-  void DidChangeTilePriority(Tile* tile);
-
   void CleanUpReleasedTiles();
 
   // Overriden from RefCountedManager<Tile>:
+  friend class Tile;
   virtual void Release(Tile* tile) OVERRIDE;
 
   // Overriden from RasterizerClient:
   virtual bool ShouldForceTasksRequiredForActivationToComplete() const OVERRIDE;
   virtual void DidFinishRunningTasks() OVERRIDE;
   virtual void DidFinishRunningTasksRequiredForActivation() OVERRIDE;
 
   typedef std::vector<Tile*> TileVector;
   typedef std::set<Tile*> TileSet;
 
   // Virtual for test
   virtual void ScheduleTasks(
       const TileVector& tiles_that_need_to_be_rasterized);
 
-  void AssignGpuMemoryToTiles(PrioritizedTileSet* tiles,
-                              TileVector* tiles_that_need_to_be_rasterized);
-  void GetTilesWithAssignedBins(PrioritizedTileSet* tiles);
+  void AssignGpuMemoryToTiles(TileVector* tiles_that_need_to_be_rasterized);
 
  private:
   enum RasterizerType {
     RASTERIZER_TYPE_DEFAULT,
     RASTERIZER_TYPE_GPU,
     NUM_RASTERIZER_TYPES
   };
 
   void OnImageDecodeTaskCompleted(int layer_id,
                                   SkPixelRef* pixel_ref,
                                   bool was_canceled);
   void OnRasterTaskCompleted(Tile::Id tile,
                              scoped_ptr<ScopedResource> resource,
                              RasterMode raster_mode,
                              const PicturePileImpl::Analysis& analysis,
                              bool was_canceled);
 
   inline size_t BytesConsumedIfAllocated(const Tile* tile) const {
     return Resource::MemorySizeBytes(tile->size(),
                                      resource_pool_->resource_format());
   }
 
   void FreeResourceForTile(Tile* tile, RasterMode mode);
   void FreeResourcesForTile(Tile* tile);
   void FreeUnusedResourcesForTile(Tile* tile);
   scoped_refptr<ImageDecodeTask> CreateImageDecodeTask(Tile* tile,
                                                        SkPixelRef* pixel_ref);
   scoped_refptr<RasterTask> CreateRasterTask(Tile* tile);
   scoped_ptr<base::Value> GetMemoryRequirementsAsValue() const;
-  void UpdatePrioritizedTileSetIfNeeded();
 
   TileManagerClient* client_;
   ResourcePool* resource_pool_;
   scoped_ptr<RasterizerDelegate> rasterizer_delegate_;
   GlobalStateThatImpactsTilePriority global_state_;
 
   typedef base::hash_map<Tile::Id, Tile*> TileMap;
   TileMap tiles_;
 
-  PrioritizedTileSet prioritized_tiles_;
-  bool prioritized_tiles_dirty_;
-
   bool all_tiles_that_need_to_be_rasterized_have_memory_;
   bool all_tiles_required_for_activation_have_memory_;
 
-  size_t memory_required_bytes_;
-  size_t memory_nice_to_have_bytes_;
-
   size_t bytes_releasable_;
   size_t resources_releasable_;
   size_t max_raster_usage_bytes_;
 
   bool ever_exceeded_memory_budget_;
   MemoryHistory::Entry memory_stats_from_last_assign_;
 
   RenderingStatsInstrumentation* rendering_stats_instrumentation_;
 
   bool did_initialize_visible_tile_;
@@ skipping 21 matching lines @@
   std::vector<scoped_refptr<RasterTask> > orphan_raster_tasks_;
 
   std::vector<PictureLayerImpl*> layers_;
 
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILE_MANAGER_H_