cc: Move data to LayerTree from LayerTreeHost.

cc/trees/layer_tree_host_unittest_serialization.cc

 // Copyright 2015 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/trees/layer_tree_host.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "cc/layers/empty_content_layer_client.h"
@@ skipping 163 matching lines @@
           EXPECT_EQ(proto::LayerNode::HEADS_UP_DISPLAY_LAYER,
                     proto.root_layer().children(i).type());
           found_hud_layer_type = true;
           break;
         }
       }
       EXPECT_TRUE(found_hud_layer_type);
     } else {
       EXPECT_FALSE(layer_tree_host_dst_->hud_layer_);
     }
-    if (layer_tree_host_src_->overscroll_elasticity_layer_) {
-      EXPECT_EQ(layer_tree_host_src_->overscroll_elasticity_layer_->id(),
-                layer_tree_host_dst_->overscroll_elasticity_layer_->id());
+    if (layer_tree_src->overscroll_elasticity_layer()) {
+      EXPECT_EQ(layer_tree_src->overscroll_elasticity_layer()->id(),
+                layer_tree_dst->overscroll_elasticity_layer()->id());
     } else {
-      EXPECT_FALSE(layer_tree_host_dst_->overscroll_elasticity_layer_);
+      EXPECT_FALSE(layer_tree_dst->overscroll_elasticity_layer());
     }
-    if (layer_tree_host_src_->page_scale_layer_) {
-      EXPECT_EQ(layer_tree_host_src_->page_scale_layer_->id(),
-                layer_tree_host_dst_->page_scale_layer_->id());
+    if (layer_tree_src->page_scale_layer()) {
+      EXPECT_EQ(layer_tree_src->page_scale_layer()->id(),
+                layer_tree_dst->page_scale_layer()->id());
     } else {
-      EXPECT_FALSE(layer_tree_host_dst_->page_scale_layer_);
+      EXPECT_FALSE(layer_tree_dst->page_scale_layer());
     }
-    if (layer_tree_host_src_->inner_viewport_scroll_layer_) {
-      EXPECT_EQ(layer_tree_host_src_->inner_viewport_scroll_layer_->id(),
-                layer_tree_host_dst_->inner_viewport_scroll_layer_->id());
+    if (layer_tree_src->inner_viewport_scroll_layer()) {
+      EXPECT_EQ(layer_tree_src->inner_viewport_scroll_layer()->id(),
+                layer_tree_dst->inner_viewport_scroll_layer()->id());
     } else {
-      EXPECT_FALSE(layer_tree_host_dst_->inner_viewport_scroll_layer_);
+      EXPECT_FALSE(layer_tree_dst->inner_viewport_scroll_layer());
     }
-    if (layer_tree_host_src_->outer_viewport_scroll_layer_) {
-      EXPECT_EQ(layer_tree_host_src_->outer_viewport_scroll_layer_->id(),
-                layer_tree_host_dst_->outer_viewport_scroll_layer_->id());
+    if (layer_tree_src->outer_viewport_scroll_layer()) {
+      EXPECT_EQ(layer_tree_src->outer_viewport_scroll_layer()->id(),
+                layer_tree_dst->outer_viewport_scroll_layer()->id());
     } else {
-      EXPECT_FALSE(layer_tree_host_dst_->outer_viewport_scroll_layer_);
+      EXPECT_FALSE(layer_tree_dst->outer_viewport_scroll_layer());
     }
     EXPECT_EQ(layer_tree_host_src_->selection_,
               layer_tree_host_dst_->selection_);
     EXPECT_EQ(layer_tree_host_src_->property_trees_,
               layer_tree_host_dst_->property_trees_);
     EXPECT_EQ(layer_tree_host_src_->surface_client_id_,
               layer_tree_host_dst_->surface_client_id_);
     EXPECT_EQ(layer_tree_host_src_->next_surface_sequence_,
               layer_tree_host_dst_->next_surface_sequence_);
 
@@ skipping 46 matching lines @@
         !layer_tree_host_src_->content_is_suitable_for_gpu_rasterization_;
     layer_tree_host_src_->background_color_ = SK_ColorMAGENTA;
     layer_tree_host_src_->has_transparent_background_ =
         !layer_tree_host_src_->has_transparent_background_;
     layer_tree_host_src_->id_ = layer_tree_host_src_->id_ * 3 + 1;
     layer_tree_host_src_->next_commit_forces_redraw_ =
         !layer_tree_host_src_->next_commit_forces_redraw_;
 
     layer_tree_host_src_->hud_layer_ = HeadsUpDisplayLayer::Create();
     root_layer_src->AddChild(layer_tree_host_src_->hud_layer_);
-    layer_tree_host_src_->overscroll_elasticity_layer_ = Layer::Create();
-    root_layer_src->AddChild(
-        layer_tree_host_src_->overscroll_elasticity_layer_);
-    layer_tree_host_src_->page_scale_layer_ = Layer::Create();
-    root_layer_src->AddChild(layer_tree_host_src_->page_scale_layer_);
-    layer_tree_host_src_->inner_viewport_scroll_layer_ = Layer::Create();
-    root_layer_src->AddChild(
-        layer_tree_host_src_->inner_viewport_scroll_layer_);
-    layer_tree_host_src_->outer_viewport_scroll_layer_ = Layer::Create();
-    root_layer_src->AddChild(
-        layer_tree_host_src_->outer_viewport_scroll_layer_);
+
+    scoped_refptr<Layer> overscroll_elasticity_layer = Layer::Create();
+    scoped_refptr<Layer> page_scale_layer = Layer::Create();
+    scoped_refptr<Layer> inner_viewport_scroll_layer = Layer::Create();
+    scoped_refptr<Layer> outer_viewport_scroll_layer = Layer::Create();
+
+    root_layer_src->AddChild(overscroll_elasticity_layer);
+    root_layer_src->AddChild(page_scale_layer);
+    root_layer_src->AddChild(inner_viewport_scroll_layer);
+    root_layer_src->AddChild(outer_viewport_scroll_layer);
+
+    layer_tree_host_src_->GetLayerTree()->RegisterViewportLayers(
+        overscroll_elasticity_layer, page_scale_layer,
+        inner_viewport_scroll_layer, outer_viewport_scroll_layer);
 
     // Set in_paint_layer_contents_ only after all calls to AddChild() have
     // finished to ensure it's allowed to do so at that time.
     LayerTree* layer_tree_src = layer_tree_host_src_->GetLayerTree();
     layer_tree_src->in_paint_layer_contents_ =
         !layer_tree_src->in_paint_layer_contents();
 
     LayerSelectionBound sel_bound;
     sel_bound.edge_top = gfx::Point(14, 3);
     LayerSelection selection;
@@ skipping 13 matching lines @@
 
   void RunLayersChangedTest() {
     // Just fake setup a layer for both source and dest.
     scoped_refptr<Layer> root_layer_src = Layer::Create();
     layer_tree_host_src_->SetRootLayer(root_layer_src);
     layer_tree_host_dst_->SetRootLayer(Layer::Create());
     root_layer_src->SetDoubleSided(!root_layer_src->double_sided());
 
     // No HUD layer or |overscroll_elasticity_layer_|, or the inner/outer
     // viewport scroll layers.
-    layer_tree_host_src_->overscroll_elasticity_layer_ = Layer::Create();
-    root_layer_src->AddChild(
-        layer_tree_host_src_->overscroll_elasticity_layer_);
+    scoped_refptr<Layer> overscroll_elasticity_layer = Layer::Create();
+    layer_tree_host_src_->GetLayerTree()->inputs_.overscroll_elasticity_layer =
+        overscroll_elasticity_layer;
+    root_layer_src->AddChild(overscroll_elasticity_layer);
 
     VerifySerializationAndDeserialization();
   }
 
   void RunLayersChangedMultipleSerializations() {
     // Just fake setup a layer for both source and dest.
     scoped_refptr<Layer> root_layer_src = Layer::Create();
     layer_tree_host_src_->SetRootLayer(root_layer_src);
     layer_tree_host_dst_->SetRootLayer(Layer::Create());
     root_layer_src->SetDoubleSided(!root_layer_src->double_sided());
 
     // Ensure that all the layers work correctly for multiple rounds of
     // serialization and deserialization.
     layer_tree_host_src_->hud_layer_ = HeadsUpDisplayLayer::Create();
     root_layer_src->AddChild(layer_tree_host_src_->hud_layer_);
-    layer_tree_host_src_->overscroll_elasticity_layer_ = Layer::Create();
-    root_layer_src->AddChild(
-        layer_tree_host_src_->overscroll_elasticity_layer_);
-    layer_tree_host_src_->page_scale_layer_ = Layer::Create();
-    root_layer_src->AddChild(layer_tree_host_src_->page_scale_layer_);
-    layer_tree_host_src_->inner_viewport_scroll_layer_ = Layer::Create();
-    root_layer_src->AddChild(
-        layer_tree_host_src_->inner_viewport_scroll_layer_);
-    layer_tree_host_src_->outer_viewport_scroll_layer_ = Layer::Create();
-    root_layer_src->AddChild(
-        layer_tree_host_src_->outer_viewport_scroll_layer_);
+
+    scoped_refptr<Layer> overscroll_elasticity_layer = Layer::Create();
+    scoped_refptr<Layer> page_scale_layer = Layer::Create();
+    scoped_refptr<Layer> inner_viewport_scroll_layer = Layer::Create();
+    scoped_refptr<Layer> outer_viewport_scroll_layer = Layer::Create();
+
+    root_layer_src->AddChild(overscroll_elasticity_layer);
+    root_layer_src->AddChild(page_scale_layer);
+    root_layer_src->AddChild(inner_viewport_scroll_layer);
+    root_layer_src->AddChild(outer_viewport_scroll_layer);
+    layer_tree_host_src_->GetLayerTree()->RegisterViewportLayers(
+        overscroll_elasticity_layer, page_scale_layer,
+        inner_viewport_scroll_layer, outer_viewport_scroll_layer);
 
     VerifySerializationAndDeserialization();
     VerifySerializationAndDeserialization();
 
     layer_tree_host_src_->hud_layer_ = nullptr;
     VerifySerializationAndDeserialization();
-    layer_tree_host_src_->overscroll_elasticity_layer_ = nullptr;
+    layer_tree_host_src_->GetLayerTree()->inputs_.overscroll_elasticity_layer =
+        nullptr;
     VerifySerializationAndDeserialization();
-    layer_tree_host_src_->page_scale_layer_ = nullptr;
+    layer_tree_host_src_->GetLayerTree()->inputs_.page_scale_layer = nullptr;
     VerifySerializationAndDeserialization();
-    layer_tree_host_src_->inner_viewport_scroll_layer_ = nullptr;
+    layer_tree_host_src_->GetLayerTree()->inputs_.inner_viewport_scroll_layer =
+        nullptr;
     VerifySerializationAndDeserialization();
-    layer_tree_host_src_->outer_viewport_scroll_layer_ = nullptr;
+    layer_tree_host_src_->GetLayerTree()->inputs_.outer_viewport_scroll_layer =
+        nullptr;
     VerifySerializationAndDeserialization();
   }
 
   void RunPictureLayerMultipleSerializationsTest() {
     // Just fake setup a layer for both source and dest.
     scoped_refptr<Layer> root_layer_src = Layer::Create();
     layer_tree_host_src_->SetRootLayer(root_layer_src);
     layer_tree_host_dst_->SetRootLayer(Layer::Create());
 
     // Ensure that a PictureLayer work correctly for multiple rounds of
@@ skipping 82 matching lines @@
 
 TEST_F(LayerTreeHostSerializationTest, AddAndRemoveNodeFromLayerTree) {
   RunAddAndRemoveNodeFromLayerTree();
 }
 
 TEST_F(LayerTreeHostSerializationTest, PictureLayerMultipleSerializations) {
   RunPictureLayerMultipleSerializationsTest();
 }
 
 }  // namespace cc