Moving RenderSurface creation outside of CalcDrawProps

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/trees/layer_tree_host_common.h"
 
 namespace cc {
 
 LayerTreeHostCommonTestBase::LayerTreeHostCommonTestBase()
     : 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>(layer,
-                                              transform,
-                                              transform_origin,
-                                              position,
-                                              bounds,
-                                              flatten_transform,
-                                              is_3d_sorted);
+  SetLayerPropertiesForTestingInternal(layer,
+                                       transform,
+                                       transform_origin,
+                                       position,
+                                       bounds,
+                                       flatten_transform,
+                                       is_3d_sorted,
+                                       false);
 }
 
 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<LayerImpl>(layer,
-                                                  transform,
-                                                  transform_origin,
-                                                  position,
-                                                  bounds,
-                                                  flatten_transform,
-                                                  is_3d_sorted);
+    bool is_3d_sorted,
+    bool create_render_surface) {
+  SetLayerPropertiesForTestingInternal(layer,
+                                       transform,
+                                       transform_origin,
+                                       position,
+                                       bounds,
+                                       flatten_transform,
+                                       is_3d_sorted,
+                                       create_render_surface);
   layer->SetContentBounds(bounds);
 }
 
+void LayerTreeHostCommonTestBase::SetLayerPropertiesForTestingInternal(
+    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,
+    bool create_render_surface) {

[danakj, 2014/09/03 19:30:33]

this is always false, so just remove it?

[awoloszyn, 2014/09/09 15:31:36]

Done.

+  layer->SetTransform(transform);
+  layer->SetTransformOrigin(transform_origin);
+  layer->SetPosition(position);
+  layer->SetBounds(bounds);
+  layer->SetShouldFlattenTransform(flatten_transform);
+  layer->Set3dSortingContextId(is_3d_sorted ? 1 : 0);
+  if (create_render_surface) {
+    layer->CreateRenderSurface();
+  }
+}
+
+void LayerTreeHostCommonTestBase::SetLayerPropertiesForTestingInternal(
+    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) {
+  layer->SetTransform(transform);
+  layer->SetTransformOrigin(transform_origin);
+  layer->SetPosition(position);
+  layer->SetBounds(bounds);
+  layer->SetShouldFlattenTransform(flatten_transform);
+  layer->Set3dSortingContextId(is_3d_sorted ? 1 : 0);
+  if (create_render_surface) {
+    layer->SetHasRenderSurface(true);
+  }
+}
+
 void LayerTreeHostCommonTestBase::ExecuteCalculateDrawProperties(
     Layer* root_layer,
     float device_scale_factor,
     float page_scale_factor,
     Layer* page_scale_application_layer,
     bool can_use_lcd_text) {
   EXPECT_TRUE(page_scale_application_layer || (page_scale_factor == 1.f));
   gfx::Transform identity_matrix;
   gfx::Size device_viewport_size =
       gfx::Size(root_layer->bounds().width() * device_scale_factor,
@@ skipping 39 matching lines @@
   inputs.can_adjust_raster_scales = true;
 
   ++render_surface_layer_list_count_;
   inputs.current_render_surface_layer_list_id =
       render_surface_layer_list_count_;
 
   LayerTreeHostCommon::CalculateDrawProperties(&inputs);
 }
 
 }  // namespace cc