cc: Remove tile sharing from tilings.

cc/resources/picture_layer_tiling_set.cc

Index: cc/resources/picture_layer_tiling_set.cc
diff --git a/cc/resources/picture_layer_tiling_set.cc b/cc/resources/picture_layer_tiling_set.cc
index e616ce2c54788b5abfcfe8bd32b47f923f57a77d..4ce4a9dd8dc7192268aa6f3fe1ae555b8c5ac186 100644
--- a/cc/resources/picture_layer_tiling_set.cc
+++ b/cc/resources/picture_layer_tiling_set.cc
@@ -8,6 +8,9 @@
 #include <set>
 #include <vector>
 
+#include "cc/resources/active_picture_layer_tiling.h"
+#include "cc/resources/pending_picture_layer_tiling.h"
+
 namespace cc {
 
 namespace {
@@ -67,14 +70,15 @@ void PictureLayerTilingSet::CopyTilingsFromPendingTwin(
     float contents_scale = pending_twin_tiling->contents_scale();
     PictureLayerTiling* this_tiling = FindTilingWithScale(contents_scale);
     if (!this_tiling) {
-      scoped_ptr<PictureLayerTiling> new_tiling = PictureLayerTiling::Create(
-          contents_scale, raster_source, client_, max_tiles_for_interest_area_,
-          skewport_target_time_in_seconds_,
-          skewport_extrapolation_limit_in_content_pixels_);
+      scoped_ptr<PictureLayerTiling> new_tiling =
+          ActivePictureLayerTiling::Create(
+              contents_scale, raster_source, client_,
+              max_tiles_for_interest_area_, skewport_target_time_in_seconds_,
+              skewport_extrapolation_limit_in_content_pixels_);
       tilings_.push_back(new_tiling.Pass());
       this_tiling = tilings_.back();
     }
-    this_tiling->CloneTilesAndPropertiesFrom(*pending_twin_tiling);
+    this_tiling->TakeTilesAndPropertiesFrom(pending_twin_tiling);
   }
 }
 
@@ -217,10 +221,17 @@ PictureLayerTiling* PictureLayerTilingSet::AddTiling(
     DCHECK_EQ(tilings_[i]->raster_source(), raster_source.get());
   }
 
-  tilings_.push_back(PictureLayerTiling::Create(
-      contents_scale, raster_source, client_, max_tiles_for_interest_area_,
-      skewport_target_time_in_seconds_,
-      skewport_extrapolation_limit_in_content_pixels_));
+  if (client_->GetTree() == PENDING_TREE) {
+    tilings_.push_back(PendingPictureLayerTiling::Create(
+        contents_scale, raster_source, client_, max_tiles_for_interest_area_,
+        skewport_target_time_in_seconds_,
+        skewport_extrapolation_limit_in_content_pixels_));
+  } else {
+    tilings_.push_back(ActivePictureLayerTiling::Create(
+        contents_scale, raster_source, client_, max_tiles_for_interest_area_,
+        skewport_target_time_in_seconds_,
+        skewport_extrapolation_limit_in_content_pixels_));
+  }
   PictureLayerTiling* appended = tilings_.back();
 
   tilings_.sort(LargestToSmallestScaleFunctor());