cc: Remove tile ref counting 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 <queue>
 #include <set>
 #include <vector>
@@ skipping 92 matching lines @@
   friend class Tile;
   void RegisterTile(Tile* tile);
   void UnregisterTile(Tile* tile);
 
   // Overriden from RasterWorkerPoolClient:
   virtual bool ShouldForceTasksRequiredForActivationToComplete() const
       OVERRIDE;
   virtual void DidFinishedRunningTasks() OVERRIDE;
   virtual void DidFinishedRunningTasksRequiredForActivation() OVERRIDE;
 
+  typedef std::vector<Tile*> TileVector;
+
   // Virtual for test
-  virtual void ScheduleTasks();
+  virtual void ScheduleTasks(
+      const TileVector& tiles_that_need_to_be_rasterized);
 
-  const std::vector<Tile*>& tiles_that_need_to_be_rasterized() const {
-    return tiles_that_need_to_be_rasterized_;
-  }
-
-  void ReassignGpuMemoryToOOMTilesRequiredForActivation();
+  void ReassignGpuMemoryToOOMTilesRequiredForActivation(
+      TileVector* tiles_that_need_to_be_rasterized);
+  void AssignGpuMemoryToTiles(
+      TileVector* tiles_that_need_to_be_rasterized);
+  void AssignBinsToTiles();
+  void SortTiles();
 
  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 CleanUpUnusedImageDecodeTasks();
-  void AssignGpuMemoryToTiles();
   void FreeResourceForTile(Tile* tile, RasterMode mode);
   void FreeResourcesForTile(Tile* tile);
   void FreeUnusedResourcesForTile(Tile* tile);
   RasterWorkerPool::Task CreateImageDecodeTask(
       Tile* tile, skia::LazyPixelRef* pixel_ref);
   RasterTaskMetadata GetRasterTaskMetadata(const Tile& tile) const;
   RasterWorkerPool::RasterTask CreateRasterTask(Tile* tile);
   void DidFinishTileInitialization(Tile* tile);
   void DidTileTreeBinChange(Tile* tile,
                             TileManagerBin new_tree_bin,
                             WhichTree tree);
   scoped_ptr<base::Value> GetMemoryRequirementsAsValue() const;
   void AddRequiredTileForActivation(Tile* tile);
 
   TileManagerClient* client_;
   scoped_ptr<ResourcePool> resource_pool_;
   scoped_ptr<RasterWorkerPool> raster_worker_pool_;
   GlobalStateThatImpactsTilePriority global_state_;
 
-  typedef std::vector<Tile*> TileVector;
+  typedef std::set<Tile*> TileSet;

[reveman, 2013/07/03 20:20:06]

move this below TileVector tiles_;

[vmpstr, 2013/07/03 23:47:51]

Done.

   TileVector tiles_;

[reveman, 2013/07/03 20:20:06]

how about sorted_tiles_?

[vmpstr, 2013/07/03 23:47:51]

Done.

-  TileVector tiles_that_need_to_be_rasterized_;
-  typedef std::set<Tile*> TileSet;
   TileSet tiles_that_need_to_be_initialized_for_activation_;
   TileSet oom_tiles_that_need_to_be_initialized_for_activation_;

[reveman, 2013/07/03 20:20:06]

|oom_tiles_that_need_to_be_initialized_for_activation_| doesn't have to be a
member. It can be local to functions calling AssignGpuMem and passed as
parameter to that AssignGpuMem

[vmpstr, 2013/07/03 23:47:51]

Done.

 
   bool ever_exceeded_memory_budget_;
   MemoryHistory::Entry memory_stats_from_last_assign_;
 
   RenderingStatsInstrumentation* rendering_stats_instrumentation_;
 
   bool did_initialize_visible_tile_;
 
   GLenum texture_format_;
 
   typedef base::hash_map<uint32_t, RasterWorkerPool::Task> PixelRefTaskMap;
   typedef base::hash_map<int, PixelRefTaskMap> LayerPixelRefTaskMap;
   LayerPixelRefTaskMap image_decode_tasks_;
 
+  typedef base::hash_map<ManagedTileId, Tile*> TileMap;
+  TileMap managed_tiles_;

[reveman, 2013/07/03 20:20:06]

This is now the most important container of this class. I really think we should
move it to the top and call it |tiles_|.

[vmpstr, 2013/07/03 23:47:51]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILE_MANAGER_H_