cc: Add some more infrastructure for two trees

cc/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/picture_layer_tiling_set.h"
 
 namespace cc {
 
 PictureLayerTilingSet::PictureLayerTilingSet(
     PictureLayerTilingClient * client)
     : client_(client) {
 }
 
 PictureLayerTilingSet::~PictureLayerTilingSet() {
 }
 
-void PictureLayerTilingSet::CloneFrom(const PictureLayerTilingSet& other) {
+void PictureLayerTilingSet::CloneAll(
+    const PictureLayerTilingSet& other,
+    const Region& invalidation) {
   layer_bounds_ = other.layer_bounds_;
   tilings_.clear();
   tilings_.reserve(other.tilings_.size());
   for (size_t i = 0; i < other.tilings_.size(); ++i) {
     tilings_.append(other.tilings_[i]->Clone());
+    tilings_.last()->Invalidate(invalidation);
   }
 }
 
+void PictureLayerTilingSet::Clone(
+    const PictureLayerTiling* tiling,
+    const Region& invalidation) {
+
+  for (size_t i = 0; i < tilings_.size(); ++i)
+    DCHECK_NE(tilings_[i]->contents_scale(), tiling->contents_scale());
+
+  tilings_.append(tiling->Clone());
+  tilings_.last()->Invalidate(invalidation);
+}
+
 void PictureLayerTilingSet::SetLayerBounds(gfx::Size layer_bounds) {
   if (layer_bounds_ == layer_bounds)
     return;
   layer_bounds_ = layer_bounds;
   for (size_t i = 0; i < tilings_.size(); ++i)
     tilings_[i]->SetLayerBounds(layer_bounds);
 }
 
 gfx::Size PictureLayerTilingSet::LayerBounds() const {
   return layer_bounds_;
 }
 
 void PictureLayerTilingSet::Invalidate(const Region& invalidation) {
   if (invalidation.IsEmpty())
     return;
 
   for (size_t i = 0; i < tilings_.size(); ++i)
     tilings_[i]->Invalidate(invalidation);
 }
 
-void PictureLayerTilingSet::AddTiling(float contents_scale,
-                                      gfx::Size tile_size) {
+const PictureLayerTiling* PictureLayerTilingSet::AddTiling(
+    float contents_scale,
+    gfx::Size tile_size) {
   tilings_.append(PictureLayerTiling::Create(contents_scale, tile_size));
   tilings_.last()->SetClient(client_);
   tilings_.last()->SetLayerBounds(layer_bounds_);
+  return tilings_.last();
 }
 
 void PictureLayerTilingSet::Reset() {
   for (size_t i = 0; i < tilings_.size(); ++i)
     tilings_[i]->Reset();
 }
 
 PictureLayerTilingSet::Iterator::Iterator(PictureLayerTilingSet* set,
                                           float contents_scale,
                                           gfx::Rect content_rect)
@@ skipping 111 matching lines @@
     const gfx::Transform& current_screen_transform,
     double time_delta) {
   for (size_t i = 0; i < tilings_.size(); ++i) {
     tilings_[i]->UpdateTilePriorities(
         device_viewport, layer_content_scale_x, layer_content_scale_y,
         last_screen_transform, current_screen_transform, time_delta);
   }
 }
 
 }  // namespace cc