cc: Make the TileManager operate on ManagedTileState directly

cc/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_TILE_MANAGER_H_
 #define CC_TILE_MANAGER_H_
 
 #include <list>
 #include <queue>
 #include <set>
 #include <vector>
 
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "cc/memory_history.h"
 #include "cc/rendering_stats.h"
 #include "cc/resource_pool.h"
 #include "cc/tile_priority.h"
 #include "cc/worker_pool.h"
 
 namespace cc {
 class RasterWorkerPool;
 class ResourceProvider;
 class Tile;
+class TileManager;
 class TileVersion;
 
 class CC_EXPORT TileManagerClient {
  public:
   virtual void ScheduleManageTiles() = 0;
   virtual void DidUploadVisibleHighResolutionTile() = 0;
 
  protected:
   virtual ~TileManagerClient() {}
 };
@@ skipping 30 matching lines @@
     TileRasterState bin);
 
 // Metadata that is passed to raster tasks for diagnostic purposes.
 struct RasterTaskMetadata {
     bool is_tile_in_pending_tree_now_bin;
     TileResolution tile_resolution;
 };
 
 // This is state that is specific to a tile that is
 // managed by the TileManager.
-class CC_EXPORT ManagedTileState {
+class CC_EXPORT ManagedTileState : public base::RefCounted<ManagedTileState> {
  public:
-  ManagedTileState();
-  ~ManagedTileState();
+  ManagedTileState(Tile* tile);
   scoped_ptr<base::Value> AsValue() const;
 
   // Persisted state: valid all the time.
+  scoped_refptr<Tile> tile;
   bool can_use_gpu_memory;
   bool can_be_freed;
   scoped_ptr<ResourcePool::Resource> resource;
   bool resource_is_being_initialized;
   bool contents_swizzled;
   bool need_to_gather_pixel_refs;
   std::list<skia::LazyPixelRef*> pending_pixel_refs;
   TileRasterState raster_state;
 
   // Ephemeral state, valid only during Manage.
   TileManagerBin bin[NUM_BIN_PRIORITIES];
   TileManagerBin tree_bin[NUM_TREES];
   // The bin that the tile would have if the GPU memory manager had a maximally permissive policy,
   // send to the GPU memory manager to determine policy.
   TileManagerBin gpu_memmgr_stats_bin;
   TileResolution resolution;
   float time_to_needed_in_seconds;
   float distance_to_visible_in_pixels;
+
+ private:
+  friend class base::RefCounted<ManagedTileState>;
+  ~ManagedTileState();
 };
 
 // This class manages tiles, deciding which should get rasterized and which
 // should no longer have any memory assigned to them. Tile objects are "owned"
 // by layers; they automatically register with the manager when they are
 // created, and unregister from the manager when they are deleted.
 class CC_EXPORT TileManager : public WorkerPoolClient {
  public:
   TileManager(TileManagerClient* client,
               ResourceProvider *resource_provider,
@@ skipping 22 matching lines @@
   const MemoryHistory::Entry& memory_stats_from_last_assign() const {
     return memory_stats_from_last_assign_;
   }
 
   // Overridden from WorkerPoolClient:
   virtual void DidFinishDispatchingWorkerPoolCompletionCallbacks() OVERRIDE;
 
  protected:
   // Methods called by Tile
   friend class Tile;
-  void RegisterTile(Tile* tile);
-  void UnregisterTile(Tile* tile);
+  friend class TileHandle;
+  friend class ManagedTileState;
+  scoped_refptr<ManagedTileState> RegisterTile(Tile* tile);
   void WillModifyTilePriority(
       Tile* tile, WhichTree tree, const TilePriority& new_priority) {
     // TODO(nduca): Do something smarter if reprioritization turns out to be
     // costly.
     ScheduleManageTiles();
   }
 
  private:
+  void RegisterManagedTile(ManagedTileState* mts);
+  void UnregisterManagedTile(ManagedTileState* mts);
   void SortTiles();
   void AssignGpuMemoryToTiles();
-  void FreeResourcesForTile(Tile* tile);
+  void FreeResourcesForTile(ManagedTileState* mts);
   void ScheduleManageTiles() {
     if (manage_tiles_pending_)
       return;
     client_->ScheduleManageTiles();
     manage_tiles_pending_ = true;
   }
   void DispatchMoreTasks();
-  void GatherPixelRefsForTile(Tile* tile);
-  void DispatchImageDecodeTasksForTile(Tile* tile);
+  void GatherPixelRefsForTile(ManagedTileState* mts);
+  void DispatchImageDecodeTasksForTile(ManagedTileState* mts);
   void DispatchOneImageDecodeTask(
-      scoped_refptr<Tile> tile, skia::LazyPixelRef* pixel_ref);
+      scoped_refptr<ManagedTileState> tile, skia::LazyPixelRef* pixel_ref);
   void OnImageDecodeTaskCompleted(
-      scoped_refptr<Tile> tile,
-      uint32_t pixel_ref_id);
-  bool CanDispatchRasterTask(Tile* tile);
-  scoped_ptr<ResourcePool::Resource> PrepareTileForRaster(Tile* tile);
-  void DispatchOneRasterTask(scoped_refptr<Tile> tile);
-  void PerformOneRaster(Tile* tile);
+      scoped_refptr<ManagedTileState> tile, uint32_t pixel_ref_id);
+  bool CanDispatchRasterTask(ManagedTileState* mts);
+  scoped_ptr<ResourcePool::Resource> PrepareTileForRaster(
+      ManagedTileState* mts);
+  void DispatchOneRasterTask(scoped_refptr<ManagedTileState> tile);
+  void PerformOneRaster(ManagedTileState* mts);
   void OnRasterCompleted(
-      scoped_refptr<Tile> tile,
+      scoped_refptr<ManagedTileState> tile,
       scoped_ptr<ResourcePool::Resource> resource,
       int manage_tiles_call_count_when_dispatched);
   void OnRasterTaskCompleted(
-      scoped_refptr<Tile> tile,
+      scoped_refptr<ManagedTileState> tile,
       scoped_ptr<ResourcePool::Resource> resource,
       int manage_tiles_call_count_when_dispatched);
-  void DidFinishTileInitialization(Tile* tile);
-  void DidTileRasterStateChange(Tile* tile, TileRasterState state);
-  void DidTileTreeBinChange(Tile* tile,
+  void DidFinishTileInitialization(ManagedTileState* mts);
+  void DidTileRasterStateChange(ManagedTileState* mts, TileRasterState state);
+  void DidTileTreeBinChange(ManagedTileState* mts,
                             TileManagerBin new_tree_bin,
                             WhichTree tree);
   scoped_ptr<Value> GetMemoryRequirementsAsValue() const;
 
   static void PerformRaster(uint8* buffer,
                             const gfx::Rect& rect,
                             float contents_scale,
                             bool use_cheapness_estimator,
                             const RasterTaskMetadata& raster_task_metadata,
                             PicturePileImpl* picture_pile,
                             RenderingStats* stats);
   static void RunImageDecodeTask(skia::LazyPixelRef* pixel_ref,
                                  RenderingStats* stats);
 
   static void RecordCheapnessPredictorResults(bool is_predicted_cheap,
                                               bool is_actually_cheap);
 
   TileManagerClient* client_;
   scoped_ptr<ResourcePool> resource_pool_;
   scoped_ptr<RasterWorkerPool> raster_worker_pool_;
   bool manage_tiles_pending_;
   int manage_tiles_call_count_;
 
   GlobalStateThatImpactsTilePriority global_state_;
 
-  typedef std::vector<Tile*> TileVector;
-  typedef std::set<Tile*> TileSet;
+  typedef std::vector<ManagedTileState*> TileVector;
+  typedef std::set<ManagedTileState*> TileSet;
   TileSet all_tiles_;
   TileVector live_or_allocated_tiles_;
   TileVector tiles_that_need_to_be_rasterized_;
 
-  typedef std::list<Tile*> TileList;
+  typedef std::list<ManagedTileState*> TileList;
   // Tiles with image decoding tasks. These tiles need to be rasterized
   // when all the image decoding tasks finish.
   TileList tiles_with_image_decoding_tasks_;
 
   typedef base::hash_map<uint32_t, skia::LazyPixelRef*> PixelRefMap;
   PixelRefMap pending_decode_tasks_;
 
-  typedef std::queue<scoped_refptr<Tile> > TileQueue;
+  typedef std::queue<scoped_refptr<ManagedTileState> > TileQueue;
   TileQueue tiles_with_pending_set_pixels_;
   size_t bytes_pending_set_pixels_;
   bool has_performed_uploads_since_last_flush_;
   bool ever_exceeded_memory_budget_;
   MemoryHistory::Entry memory_stats_from_last_assign_;
 
   bool record_rendering_stats_;
   RenderingStats rendering_stats_;
 
   bool use_cheapness_estimator_;
   int raster_state_count_[NUM_STATES][NUM_TREES][NUM_BINS];
 
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_TILE_MANAGER_H_