Moving RenderSurface creation outside of CalcDrawProps

cc/trees/layer_tree_host_common.h

 // Copyright 2011 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_TREES_LAYER_TREE_HOST_COMMON_H_
 #define CC_TREES_LAYER_TREE_HOST_COMMON_H_
 
 #include <limits>
 #include <vector>
 
@@ skipping 66 matching lines @@
       : public CalcDrawPropsInputs<LayerType, RenderSurfaceLayerListType> {
     CalcDrawPropsInputsForTesting(
         LayerType* root_layer,
         const gfx::Size& device_viewport_size,
         const gfx::Transform& device_transform,
         RenderSurfaceLayerListType* render_surface_layer_list);
     CalcDrawPropsInputsForTesting(
         LayerType* root_layer,
         const gfx::Size& device_viewport_size,
         RenderSurfaceLayerListType* render_surface_layer_list);
+    CalcDrawPropsInputsForTesting(
+        LayerType* root_layer,
+        const gfx::Size& device_viewport_size,
+        const gfx::Transform& device_transform,
+        float device_scale_factor,
+        float page_scale_factor,
+        const LayerType* page_scale_application_layer,
+        int max_texture_size,
+        bool can_use_lcd_text,
+        bool can_render_to_separate_surface,
+        bool can_adjust_raster_scales,
+        RenderSurfaceLayerListType* render_surface_layer_list,
+        int current_render_surface_layer_list_id)
+        : CalcDrawPropsInputs<LayerType, RenderSurfaceLayerListType>(
+              root_layer,
+              device_viewport_size,
+              device_transform,
+              device_scale_factor,
+              page_scale_factor,
+              page_scale_application_layer,
+              max_texture_size,
+              can_use_lcd_text,
+              can_render_to_separate_surface,
+              can_adjust_raster_scales,
+              render_surface_layer_list,
+              current_render_surface_layer_list_id) {}
 
    private:
     const gfx::Transform identity_transform_;
   };
 
   typedef CalcDrawPropsInputs<Layer, RenderSurfaceLayerList>
       CalcDrawPropsMainInputs;
   typedef CalcDrawPropsInputsForTesting<Layer, RenderSurfaceLayerList>
       CalcDrawPropsMainInputsForTesting;
   static void CalculateDrawProperties(CalcDrawPropsMainInputs* inputs);
 
   typedef CalcDrawPropsInputs<LayerImpl, LayerImplList> CalcDrawPropsImplInputs;
   typedef CalcDrawPropsInputsForTesting<LayerImpl, LayerImplList>
       CalcDrawPropsImplInputsForTesting;
+  static void CalculateDrawProperties(
+      CalcDrawPropsImplInputsForTesting* inputs);
   static void CalculateDrawProperties(CalcDrawPropsImplInputs* inputs);
 
   template <typename LayerType>
   static bool RenderSurfaceContributesToTarget(LayerType*,
                                                int target_surface_layer_id);
 
   template <typename LayerType>
   static void CallFunctionForSubtree(
       LayerType* root_layer,
       const base::Callback<void(LayerType* layer)>& function);
@@ skipping 136 matching lines @@
           false,
           render_surface_layer_list,
           0) {
   DCHECK(root_layer);
   DCHECK(render_surface_layer_list);
 }
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_HOST_COMMON_H_