CC Animation: Erase cc::LayerSettings everywhere.

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 "cc/layers/heads_up_display_layer.h"
 #include "cc/layers/layer.h"
-#include "cc/layers/layer_settings.h"
 #include "cc/proto/layer.pb.h"
 #include "cc/proto/layer_tree_host.pb.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/layer_tree_test.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/trees/layer_tree_settings.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/point.h"
@@ skipping 148 matching lines @@
 
   void RunAllMembersChangedTest() {
     layer_tree_host_src_->needs_full_tree_sync_ =
         !layer_tree_host_src_->needs_full_tree_sync_;
     layer_tree_host_src_->needs_meta_info_recomputation_ =
         !layer_tree_host_src_->needs_meta_info_recomputation_;
     layer_tree_host_src_->source_frame_number_ *= 3;
     layer_tree_host_src_->meta_information_sequence_number_ *= 3;
 
     // Just fake setup a layer for both source and dest.
-    scoped_refptr<Layer> root_layer_src = Layer::Create(LayerSettings());
+    scoped_refptr<Layer> root_layer_src = Layer::Create();
     layer_tree_host_src_->SetRootLayer(root_layer_src);
-    layer_tree_host_dst_->SetRootLayer(Layer::Create(LayerSettings()));
+    layer_tree_host_dst_->SetRootLayer(Layer::Create());
     root_layer_src->SetDoubleSided(!root_layer_src->double_sided());
 
     layer_tree_host_src_->debug_state_.show_replica_screen_space_rects =
         !layer_tree_host_src_->debug_state_.show_replica_screen_space_rects;
     layer_tree_host_src_->device_viewport_size_ = gfx::Size(3, 14);
     layer_tree_host_src_->top_controls_shrink_blink_size_ =
         !layer_tree_host_src_->top_controls_shrink_blink_size_;
     layer_tree_host_src_->top_controls_height_ =
         layer_tree_host_src_->top_controls_height_ * 3 + 1;
     layer_tree_host_src_->top_controls_shown_ratio_ =
@@ skipping 13 matching lines @@
         !layer_tree_host_src_->has_gpu_rasterization_trigger_;
     layer_tree_host_src_->content_is_suitable_for_gpu_rasterization_ =
         !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(LayerSettings());
+    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(LayerSettings());
+    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(LayerSettings());
+    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(LayerSettings());
+    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(LayerSettings());
+    layer_tree_host_src_->outer_viewport_scroll_layer_ = Layer::Create();
     root_layer_src->AddChild(
         layer_tree_host_src_->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.
     layer_tree_host_src_->in_paint_layer_contents_ =
         !layer_tree_host_src_->in_paint_layer_contents_;
 
     LayerSelectionBound sel_bound;
     sel_bound.edge_top = gfx::Point(14, 3);
     LayerSelection selection;
     selection.start = sel_bound;
     layer_tree_host_src_->selection_ = selection;
 
     layer_tree_host_src_->property_trees_.sequence_number =
         layer_tree_host_src_->property_trees_.sequence_number * 3 + 1;
 
     layer_tree_host_src_->surface_id_namespace_ =
         layer_tree_host_src_->surface_id_namespace_ * 3 + 1;
     layer_tree_host_src_->next_surface_sequence_ =
         layer_tree_host_src_->next_surface_sequence_ * 3 + 1;
 
     VerifySerializationAndDeserialization();
   }
 
   void RunLayersChangedTest() {
     // Just fake setup a layer for both source and dest.
-    scoped_refptr<Layer> root_layer_src = Layer::Create(LayerSettings());
+    scoped_refptr<Layer> root_layer_src = Layer::Create();
     layer_tree_host_src_->SetRootLayer(root_layer_src);
-    layer_tree_host_dst_->SetRootLayer(Layer::Create(LayerSettings()));
+    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(LayerSettings());
+    layer_tree_host_src_->overscroll_elasticity_layer_ = Layer::Create();
     root_layer_src->AddChild(
         layer_tree_host_src_->overscroll_elasticity_layer_);
 
     VerifySerializationAndDeserialization();
   }
 
   void LayersChangedMultipleSerializations() {
     // Just fake setup a layer for both source and dest.
-    scoped_refptr<Layer> root_layer_src = Layer::Create(LayerSettings());
+    scoped_refptr<Layer> root_layer_src = Layer::Create();
     layer_tree_host_src_->SetRootLayer(root_layer_src);
-    layer_tree_host_dst_->SetRootLayer(Layer::Create(LayerSettings()));
+    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(LayerSettings());
+    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(LayerSettings());
+    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(LayerSettings());
+    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(LayerSettings());
+    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(LayerSettings());
+    layer_tree_host_src_->outer_viewport_scroll_layer_ = Layer::Create();
     root_layer_src->AddChild(
         layer_tree_host_src_->outer_viewport_scroll_layer_);
 
     VerifySerializationAndDeserialization();
     VerifySerializationAndDeserialization();
 
     layer_tree_host_src_->hud_layer_ = nullptr;
     VerifySerializationAndDeserialization();
     layer_tree_host_src_->overscroll_elasticity_layer_ = nullptr;
     VerifySerializationAndDeserialization();
@@ skipping 21 matching lines @@
 
 TEST_F(LayerTreeHostSerializationTest, LayersChanged) {
   RunLayersChangedTest();
 }
 
 TEST_F(LayerTreeHostSerializationTest, LayersChangedMultipleSerializations) {
   LayersChangedMultipleSerializations();
 }
 
 }  // namespace cc