cc: Remove tile sharing from tilings.

cc/resources/picture_layer_tiling_set.cc

 // 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.
 
 #include "cc/resources/picture_layer_tiling_set.h"
 
 #include <limits>
 #include <set>
 #include <vector>
 
+#include "cc/resources/active_picture_layer_tiling.h"
+#include "cc/resources/pending_picture_layer_tiling.h"
+
 namespace cc {
 
 namespace {
 
 class LargestToSmallestScaleFunctor {
  public:
   bool operator() (PictureLayerTiling* left, PictureLayerTiling* right) {
     return left->contents_scale() > right->contents_scale();
   }
 };
@@ skipping 39 matching lines @@
     // If the twin (pending) tiling set is empty, it was not updated for the
     // current frame. So we drop tilings from our set as well, instead of
     // leaving behind unshared tilings that are all non-ideal.
     RemoveAllTilings();
   }
 
   for (PictureLayerTiling* pending_twin_tiling : pending_twin_set->tilings_) {
     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);
   }
 }
 
 void PictureLayerTilingSet::UpdateTilingsToCurrentRasterSource(
     scoped_refptr<RasterSource> raster_source,
     const PictureLayerTilingSet* pending_twin_set,
     const Region& layer_invalidation,
     float minimum_contents_scale,
     float maximum_contents_scale) {
   RemoveTilingsBelowScale(minimum_contents_scale);
@@ skipping 122 matching lines @@
 }
 
 PictureLayerTiling* PictureLayerTilingSet::AddTiling(
     float contents_scale,
     scoped_refptr<RasterSource> raster_source) {
   for (size_t i = 0; i < tilings_.size(); ++i) {
     DCHECK_NE(tilings_[i]->contents_scale(), contents_scale);
     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());
   return appended;
 }
 
 int PictureLayerTilingSet::NumHighResTilings() const {
   return std::count_if(tilings_.begin(), tilings_.end(),
                        [](PictureLayerTiling* tiling) {
     return tiling->resolution() == HIGH_RESOLUTION;
@@ skipping 315 matching lines @@
     case LOWER_THAN_LOW_RES:
       range = TilingRange(low_res_range.end, tilings_.size());
       break;
   }
 
   DCHECK_LE(range.start, range.end);
   return range;
 }
 
 }  // namespace cc