cc: Added tile bundles

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 0aa89d749fb69c72217f05d6f2b537d67417f006..526558d6a96a585bfc97d15723dd893f526c5484 100644
--- a/cc/resources/tile_manager.h
+++ b/cc/resources/tile_manager.h
@@ -21,6 +21,7 @@
 #include "cc/resources/raster_worker_pool.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/tile.h"
+#include "cc/resources/tile_bundle.h"
 
 namespace cc {
 class ResourceProvider;
@@ -47,7 +48,8 @@ scoped_ptr<base::Value> RasterTaskCompletionStatsAsValue(
 // 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 RasterWorkerPoolClient,
-                              public RefCountedManager<Tile> {
+                              public RefCountedManager<Tile>,
+                              public RefCountedManager<TileBundle> {
  public:
   static scoped_ptr<TileManager> Create(
       TileManagerClient* client,
@@ -74,6 +76,8 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient,
                                  int source_frame_number,
                                  bool can_use_lcd_text);
 
+  scoped_refptr<TileBundle> CreateTileBundle(gfx::Rect bundle_rect);
+
   scoped_ptr<base::Value> BasicStateAsValue() const;
   scoped_ptr<base::Value> AllTilesAsValue() const;
   void GetMemoryStats(size_t* memory_required_bytes,
@@ -124,15 +128,21 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient,
               size_t max_raster_usage_bytes,
               RenderingStatsInstrumentation* rendering_stats_instrumentation);
 
-  // Methods called by Tile
+  // Methods called by Tile and TileBundle
+  friend class TileBundle;
   friend class Tile;
+
   void DidChangeTilePriority(Tile* tile);
+  void DidChangeTileBundlePriority(TileBundle* bundle);
 
   void CleanUpReleasedTiles();
 
   // Overriden from RefCountedManager<Tile>:
   virtual void Release(Tile* tile) OVERRIDE;
 
+  // Overridden from RefCountedManager<TileBundle>:
+  virtual void Release(TileBundle* tile) OVERRIDE;
+
   // Overriden from RasterWorkerPoolClient:
   virtual bool ShouldForceTasksRequiredForActivationToComplete() const
       OVERRIDE;
@@ -186,6 +196,9 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient,
   typedef base::hash_map<Tile::Id, Tile*> TileMap;
   TileMap tiles_;
 
+  typedef base::hash_map<TileBundle::Id, TileBundle*> TileBundleMap;
+  TileBundleMap bundles_;
+
   PrioritizedTileSet prioritized_tiles_;
   bool prioritized_tiles_dirty_;
 
@@ -217,6 +230,7 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient,
   RasterTaskCompletionStats update_visible_tiles_stats_;
 
   std::vector<Tile*> released_tiles_;
+  std::vector<TileBundle*> released_tile_bundles_;
 
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };