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 70 matching lines @@
   void GetMemoryStats(size_t* memory_required_bytes,
                       size_t* memory_nice_to_have_bytes,
                       size_t* memory_used_bytes) const;
 
   const MemoryHistory::Entry& memory_stats_from_last_assign() const {
     return memory_stats_from_last_assign_;
   }
 
   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:
   TileManager(TileManagerClient* client,
               ResourceProvider* resource_provider,
               scoped_ptr<RasterWorkerPool> raster_worker_pool,
               size_t num_raster_threads,
               RenderingStatsInstrumentation* rendering_stats_instrumentation,
               GLenum texture_format);
 
   // Methods called by Tile
   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;
+  typedef std::set<Tile*> TileSet;
+
   // 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(
+      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);
   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;
-  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_;
 
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILE_MANAGER_H_