cc: Remove tile ref counting in tile manager.

cc/resources/tile_manager.h

Index: cc/resources/tile_manager.h
diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h
index 2633a0ed3d150a03ab1af48330e5bfb9680a7d02..689d3f70ab277ab7957813f42e52094ccd8c9f02 100644
--- a/cc/resources/tile_manager.h
+++ b/cc/resources/tile_manager.h
@@ -88,7 +88,7 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient {
 
   bool AreTilesRequiredForActivationReady() const {
     return tiles_that_need_to_be_initialized_for_activation_.empty() &&
-        oom_tiles_that_need_to_be_initialized_for_activation_.empty();
+        all_tiles_required_for_activation_have_memory_;
   }
 
  protected:
@@ -110,32 +110,45 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient {
   virtual void DidFinishedRunningTasks() OVERRIDE;
   virtual void DidFinishedRunningTasksRequiredForActivation() OVERRIDE;
 
-  // Virtual for test
-  virtual void ScheduleTasks();
+  typedef std::vector<Tile*> TileVector;
+  typedef std::set<Tile*> TileSet;
 
-  const std::vector<Tile*>& tiles_that_need_to_be_rasterized() const {
-    return tiles_that_need_to_be_rasterized_;
+  // Virtual for test
+  virtual void ScheduleTasks(
+      const TileVector& tiles_that_need_to_be_rasterized);
+
+  void ReassignGpuMemoryToOOMTilesRequiredForActivation(
+      TileVector* tiles_that_need_to_be_rasterized,
+      TileSet* oom_tiles_required_for_activation);
+  void AssignGpuMemoryToTiles(
+      TileVector* tiles_that_need_to_be_rasterized,
+      TileSet* oom_tiles_required_for_activation);
+  void AssignBinsToTiles(TileVector* tiles);
+  void SortTiles(TileVector* tiles);
+
+  // Testing function.
+  void UpdateSortedTilesForTest() {
+    sorted_tiles_need_update_ = true;
+    UpdateSortedTilesIfNeeded();
   }
 
-  void ReassignGpuMemoryToOOMTilesRequiredForActivation();
-
  private:
+  // TODO(vmpstr): Make this be Tile::Id once crbug.com/253972 is fixed.
+  typedef uint64 ManagedTileId;
   void OnImageDecodeTaskCompleted(
       int layer_id,
       skia::LazyPixelRef* pixel_ref,
       bool was_canceled);
   void OnRasterTaskCompleted(
-      scoped_refptr<Tile> tile,
+      ManagedTileId tile,
       scoped_ptr<ResourcePool::Resource> resource,
       RasterMode raster_mode,
       const PicturePileImpl::Analysis& analysis,
       bool was_canceled);
 
-  void AssignBinsToTiles();
-  void SortTiles();
   RasterMode DetermineRasterMode(const Tile* tile) const;
+  void UpdateSortedTilesIfNeeded();
   void CleanUpUnusedImageDecodeTasks();
-  void AssignGpuMemoryToTiles();
   void FreeResourceForTile(Tile* tile, RasterMode mode);
   void FreeResourcesForTile(Tile* tile);
   void FreeUnusedResourcesForTile(Tile* tile);
@@ -155,12 +168,14 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient {
   scoped_ptr<RasterWorkerPool> raster_worker_pool_;
   GlobalStateThatImpactsTilePriority global_state_;
 
-  typedef std::vector<Tile*> TileVector;
-  TileVector tiles_;
-  TileVector tiles_that_need_to_be_rasterized_;
-  typedef std::set<Tile*> TileSet;
+  typedef base::hash_map<ManagedTileId, Tile*> TileMap;
+  TileMap tiles_;
+
+  TileVector sorted_tiles_;
+  bool sorted_tiles_need_update_;
+
   TileSet tiles_that_need_to_be_initialized_for_activation_;

[reveman, 2013/07/04 00:46:11]

I don't think we need this set.
bool all_tiles_required_for_activation_have_been_initialized_;
should be enough.

[vmpstr, 2013/07/08 17:28:30]

Done.

-  TileSet oom_tiles_that_need_to_be_initialized_for_activation_;
+  bool all_tiles_required_for_activation_have_memory_;
 
   bool ever_exceeded_memory_budget_;
   MemoryHistory::Entry memory_stats_from_last_assign_;