Revert of Create RenderSurface on Effect Tree

cc/test/layer_tree_host_common_test.cc

 // Copyright 2014 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/test/layer_tree_host_common_test.h"
 
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/trees/draw_property_utils.h"
 #include "cc/trees/layer_tree_host_common.h"
 
 namespace cc {
+
 LayerTreeHostCommonTestBase::LayerTreeHostCommonTestBase(
     const LayerTreeSettings& settings)
     : LayerTestCommon::LayerImplTest(settings),
       render_surface_layer_list_count_(0) {
 }
 
 LayerTreeHostCommonTestBase::~LayerTreeHostCommonTestBase() {
 }
 
 void LayerTreeHostCommonTestBase::SetLayerPropertiesForTesting(
     Layer* layer,
     const gfx::Transform& transform,
     const gfx::Point3F& transform_origin,
     const gfx::PointF& position,
     const gfx::Size& bounds,
     bool flatten_transform,
     bool is_3d_sorted) {
   SetLayerPropertiesForTestingInternal(layer, transform, transform_origin,
                                        position, bounds, flatten_transform,
                                        is_3d_sorted);
 }
 
 void LayerTreeHostCommonTestBase::SetLayerPropertiesForTesting(
     LayerImpl* layer,
     const gfx::Transform& transform,
     const gfx::Point3F& transform_origin,
     const gfx::PointF& position,
     const gfx::Size& bounds,
     bool flatten_transform,
-    bool is_3d_sorted) {
-  SetLayerPropertiesForTestingInternal(layer, transform, transform_origin,
-                                       position, bounds, flatten_transform,
-                                       is_3d_sorted);
-}
-
-void LayerTreeHostCommonTestBase::SetLayerPropertiesForTesting(
-    LayerImpl* layer,
-    const gfx::Transform& transform,
-    const gfx::Point3F& transform_origin,
-    const gfx::PointF& position,
-    const gfx::Size& bounds,
-    bool flatten_transform,
     bool is_3d_sorted,
     bool create_render_surface) {
   SetLayerPropertiesForTestingInternal(layer, transform, transform_origin,
                                        position, bounds, flatten_transform,
                                        is_3d_sorted);
   if (create_render_surface) {
-    layer->SetForceRenderSurface(true);
+    layer->SetHasRenderSurface(true);
   }
 }
 
 void LayerTreeHostCommonTestBase::ExecuteCalculateDrawProperties(
     Layer* root_layer,
     float device_scale_factor,
     float page_scale_factor,
     Layer* page_scale_layer,
     bool can_use_lcd_text,
     bool layers_always_allowed_lcd_text) {
@@ skipping 15 matching lines @@
   inputs.page_scale_layer = page_scale_layer;
   LayerTreeHostCommon::CalculateDrawProperties(&inputs);
 }
 
 void LayerTreeHostCommonTestBase::
     ExecuteCalculateDrawPropertiesWithPropertyTrees(Layer* root_layer) {
   DCHECK(root_layer->layer_tree_host());
   LayerTreeHostCommon::PreCalculateMetaInformation(root_layer);
 
   gfx::Transform identity_transform;
-
+  bool preserves_2d_axis_alignment = false;
   bool can_render_to_separate_surface = true;
+  LayerTreeHostCommon::UpdateRenderSurfaces(
+      root_layer, can_render_to_separate_surface, identity_transform,
+      preserves_2d_axis_alignment);
 
   Layer* page_scale_layer = nullptr;
   Layer* inner_viewport_scroll_layer =
       root_layer->layer_tree_host()->inner_viewport_scroll_layer();
   Layer* outer_viewport_scroll_layer =
       root_layer->layer_tree_host()->outer_viewport_scroll_layer();
   const Layer* overscroll_elasticity_layer =
       root_layer->layer_tree_host()->overscroll_elasticity_layer();
   gfx::Vector2dF elastic_overscroll =
       root_layer->layer_tree_host()->elastic_overscroll();
@@ skipping 10 matching lines @@
       can_render_to_separate_surface,
       root_layer->layer_tree_host()->property_trees(), &update_layer_list_);
 }
 
 void LayerTreeHostCommonTestBase::
     ExecuteCalculateDrawPropertiesWithPropertyTrees(LayerImpl* root_layer) {
   DCHECK(root_layer->layer_tree_impl());
   LayerTreeHostCommon::PreCalculateMetaInformationForTesting(root_layer);
 
   gfx::Transform identity_transform;
-
   bool can_render_to_separate_surface = true;
-
   LayerImpl* page_scale_layer = nullptr;
   LayerImpl* inner_viewport_scroll_layer =
       root_layer->layer_tree_impl()->InnerViewportScrollLayer();
   LayerImpl* outer_viewport_scroll_layer =
       root_layer->layer_tree_impl()->OuterViewportScrollLayer();
   LayerImpl* overscroll_elasticity_layer =
       root_layer->layer_tree_impl()->OverscrollElasticityLayer();
   gfx::Vector2dF elastic_overscroll =
       root_layer->layer_tree_impl()->elastic_overscroll()->Current(
           root_layer->layer_tree_impl()->IsActiveTree());
   float page_scale_factor = 1.f;
   float device_scale_factor = 1.f;
   gfx::Size device_viewport_size =
       gfx::Size(root_layer->bounds().width() * device_scale_factor,
                 root_layer->bounds().height() * device_scale_factor);
-  update_layer_list_impl_.reset(new LayerImplList);
+  std::vector<LayerImpl*> update_layer_list;
   BuildPropertyTreesAndComputeVisibleRects(
       root_layer, page_scale_layer, inner_viewport_scroll_layer,
       outer_viewport_scroll_layer, overscroll_elasticity_layer,
       elastic_overscroll, page_scale_factor, device_scale_factor,
       gfx::Rect(device_viewport_size), identity_transform,
       can_render_to_separate_surface,
-      root_layer->layer_tree_impl()->property_trees(),
-      update_layer_list_impl_.get());
+      root_layer->layer_tree_impl()->property_trees(), &update_layer_list);
 }
 
 void LayerTreeHostCommonTestBase::ExecuteCalculateDrawProperties(
     LayerImpl* root_layer,
     float device_scale_factor,
     float page_scale_factor,
     LayerImpl* page_scale_layer,
     bool can_use_lcd_text,
     bool layers_always_allowed_lcd_text) {
   host_impl()->active_tree()->SetDeviceScaleFactor(device_scale_factor);
@@ skipping 59 matching lines @@
 LayerTreeHostCommonTest::LayerTreeHostCommonTest()
     : LayerTreeHostCommonTestBase(LayerTreeSettings()) {
 }
 
 LayerTreeHostCommonTest::LayerTreeHostCommonTest(
     const LayerTreeSettings& settings)
     : LayerTreeHostCommonTestBase(settings) {
 }
 
 }  // namespace cc