cc: Added tile bundles

cc/layers/picture_layer_impl.cc

Index: cc/layers/picture_layer_impl.cc
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index 5e752c60540264bed19df449ffe6e064349d6f58..aecb117530c936d58fb0b7e653e5468fa2d64e97 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -174,10 +174,10 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
         } else if (mode == ManagedTileState::TileVersion::PICTURE_PILE_MODE) {
           color = DebugColors::PictureTileBorderColor();
           width = DebugColors::PictureTileBorderWidth(layer_tree_impl());
-        } else if (iter->priority(ACTIVE_TREE).resolution == HIGH_RESOLUTION) {
+        } else if (iter.priority().resolution == HIGH_RESOLUTION) {
           color = DebugColors::HighResTileBorderColor();
           width = DebugColors::HighResTileBorderWidth(layer_tree_impl());
-        } else if (iter->priority(ACTIVE_TREE).resolution == LOW_RESOLUTION) {
+        } else if (iter.priority().resolution == LOW_RESOLUTION) {
           color = DebugColors::LowResTileBorderColor();
           width = DebugColors::LowResTileBorderWidth(layer_tree_impl());
         } else if (iter->contents_scale() > contents_scale_x()) {
@@ -474,6 +474,17 @@ scoped_refptr<Tile> PictureLayerImpl::CreateTile(PictureLayerTiling* tiling,
       is_using_lcd_text_);
 }
 
+scoped_refptr<TileBundle> PictureLayerImpl::CreateTileBundle(int width,
+                                                             int height,
+                                                             int offset_x,
+                                                             int offset_y) {
+  scoped_refptr<TileBundle> bundle =
+      layer_tree_impl()->tile_manager()->CreateTileBundle(
+          width, height, offset_x, offset_y);
+  bundle->SetClient(this);
+  return bundle;
+}
+
 void PictureLayerImpl::UpdatePile(Tile* tile) {
   tile->set_picture_pile(pile_);
 }
@@ -494,6 +505,18 @@ const PictureLayerTiling* PictureLayerImpl::GetTwinTiling(
   return NULL;
 }
 
+bool PictureLayerImpl::IsRecycled() const {
+  return layer_tree_impl()->IsRecycleTree();
+}
+
+bool PictureLayerImpl::IsActive() const {
+  return layer_tree_impl()->IsActiveTree();
+}
+
+bool PictureLayerImpl::IsPending() const {
+  return layer_tree_impl()->IsPendingTree();
+}
+
 gfx::Size PictureLayerImpl::CalculateTileSize(
     gfx::Size content_bounds) const {
   if (is_mask_) {
@@ -700,7 +723,7 @@ void PictureLayerImpl::MarkVisibleResourcesAsRequired() const {
       // This iteration is over the visible content rect which is potentially
       // less conservative than projecting the viewport into the layer.
       // Ignore tiles that are know to be outside the viewport.
-      if (iter->priority(PENDING_TREE).distance_to_visible_in_pixels != 0)
+      if (iter.priority().distance_to_visible_in_pixels != 0)
         continue;
 
       missing_region.Subtract(iter.geometry_rect());
@@ -721,7 +744,7 @@ void PictureLayerImpl::MarkVisibleResourcesAsRequired() const {
     // This iteration is over the visible content rect which is potentially
     // less conservative than projecting the viewport into the layer.
     // Ignore tiles that are know to be outside the viewport.
-    if (iter->priority(PENDING_TREE).distance_to_visible_in_pixels != 0)
+    if (iter.priority().distance_to_visible_in_pixels != 0)
       continue;
 
     // If the missing region doesn't cover it, this tile is fully