cc: Make the TileManager operate on ManagedTileState directly

cc/picture_layer_tiling.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_PICTURE_LAYER_TILING_H_
 #define CC_PICTURE_LAYER_TILING_H_
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/cc_export.h"
 #include "cc/hash_pair.h"
 #include "cc/region.h"
 #include "cc/tile.h"
 #include "cc/tile_priority.h"
 #include "cc/tiling_data.h"
 #include "ui/gfx/rect.h"
 
 namespace cc {
 
 class PictureLayerTiling;
+class ManagedTileState;
 
 class PictureLayerTilingClient {
  public:
   // Create a tile at the given content_rect (in the contents scale of the
   // tiling) This might return null if the client cannot create such a tile.
   virtual scoped_refptr<Tile> CreateTile(
     PictureLayerTiling* tiling,
     gfx::Rect content_rect) = 0;
   virtual void UpdatePile(Tile* tile) = 0;
   virtual gfx::Size CalculateTileSize(
     gfx::Size current_tile_size,
     gfx::Size content_bounds) = 0;
 };
 
+class TileHandle {
+ public:
+  TileHandle(scoped_refptr<Tile> tile);
+  ~TileHandle();
+  Tile* tile() const { return tile_.get(); }
+ private:
+  scoped_refptr<Tile> tile_;
+  scoped_refptr<ManagedTileState> managed_tile_state_;
+};
+
 class CC_EXPORT PictureLayerTiling {
  public:
   ~PictureLayerTiling();
 
   // Create a tiling with no tiles.  CreateTiles must be called to add some.
   static scoped_ptr<PictureLayerTiling> Create(float contents_scale);
   scoped_ptr<PictureLayerTiling> Clone() const;
 
   gfx::Size layer_bounds() const { return layer_bounds_; }
   void SetLayerBounds(gfx::Size layer_bounds);
   void Invalidate(const Region& layer_invalidation);
 
   // Add any tiles that intersect with |layer_rect|.  If any tiles already
   // exist, then this leaves them as-is.
   void CreateTilesFromLayerRect(gfx::Rect layer_rect);
 
   void SetClient(PictureLayerTilingClient* client);
   void set_resolution(TileResolution resolution) { resolution_ = resolution; }
   TileResolution resolution() const { return resolution_; }
 
   gfx::Rect ContentRect() const;
   gfx::SizeF ContentSizeF() const;
   float contents_scale() const { return contents_scale_; }
 
   std::vector<Tile*> AllTilesForTesting() const {
     std::vector<Tile*> all_tiles;
     for (TileMap::const_iterator it = tiles_.begin();
          it != tiles_.end(); ++it)
-      all_tiles.push_back(it->second);
+      all_tiles.push_back(it->second.tile());
     return all_tiles;
   }
 
   enum LayerDeviceAlignment {
     LayerDeviceAlignmentUnknown,
     LayerAlignedToDevice,
     LayerNotAlignedToDevice,
   };
 
   // Iterate over all tiles to fill content_rect.  Even if tiles are invalid
@@ skipping 66 matching lines @@
 
   // Copies the src_tree priority into the dst_tree priority for all tiles.
   // The src_tree priority is reset to the lowest priority possible.  This
   // also updates the pile on each tile to be the current client's pile.
   void DidBecomeActive();
 
   scoped_ptr<base::Value> AsValue() const;
 
  protected:
   typedef std::pair<int, int> TileMapKey;
-  typedef base::hash_map<TileMapKey, scoped_refptr<Tile> > TileMap;
+  typedef base::hash_map<TileMapKey, TileHandle> TileMap;
 
   PictureLayerTiling(float contents_scale);
   Tile* TileAt(int, int) const;
   void CreateTilesFromContentRect(gfx::Rect layer_rect);
   void CreateTile(int i, int j);
 
   PictureLayerTilingClient* client_;
   float contents_scale_;
   gfx::Size layer_bounds_;
   gfx::Rect last_prioritized_rect_;
   // It is not legal to have a NULL tile in the tiles_ map.
   TileMap tiles_;
   TilingData tiling_data_;
   TileResolution resolution_;
   int last_source_frame_number_;
   double last_impl_frame_time_;
 
   friend class Iterator;
 };
 
 }  // namespace cc
 
 #endif  // CC_PICTURE_LAYER_TILING_H_