Moving RenderSurface creation outside of CalcDrawProps

cc/test/layer_tree_host_common_test.h

 // 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.
 
 #ifndef CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_
 #define CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 11 matching lines @@
 
 class Layer;
 class LayerImpl;
 class RenderSurfaceLayerList;
 
 class LayerTreeHostCommonTestBase {
  protected:
   LayerTreeHostCommonTestBase();
   virtual ~LayerTreeHostCommonTestBase();
 
-  template <typename LayerType>
   void SetLayerPropertiesForTestingInternal(
-      LayerType* layer,
+      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) {
-    layer->SetTransform(transform);
-    layer->SetTransformOrigin(transform_origin);
-    layer->SetPosition(position);
-    layer->SetBounds(bounds);
-    layer->SetShouldFlattenTransform(flatten_transform);
-    layer->Set3dSortingContextId(is_3d_sorted ? 1 : 0);
-  }
+      bool is_3d_sorted,
+      bool create_render_surface);
+  void 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);
 
   void 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);
 
   void 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 is_3d_sorted,
+                                    bool create_render_surface);
 
   void ExecuteCalculateDrawProperties(Layer* root_layer,
                                       float device_scale_factor,
                                       float page_scale_factor,
                                       Layer* page_scale_application_layer,
                                       bool can_use_lcd_text);
 
   void ExecuteCalculateDrawProperties(LayerImpl* root_layer,
                                       float device_scale_factor,
                                       float page_scale_factor,
@@ skipping 48 matching lines @@
 
   int render_surface_layer_list_count_;
 };
 
 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase,
                                 public testing::Test {};
 
 }  // namespace cc
 
 #endif  // CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_