Moving RenderSurface creation outside of CalcDrawProps

cc/trees/layer_tree_impl.cc

Index: cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index 759b80ef3feaca7a3288480153e84fb8e889e1d8..63036d32b4bc74eea9c33b3fffe1674ce3773b6a 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -468,20 +468,37 @@ bool LayerTreeImpl::UpdateDrawProperties() {
     bool can_render_to_separate_surface = !resourceless_software_draw();
 
     ++render_surface_layer_list_id_;
-    LayerTreeHostCommon::CalcDrawPropsImplInputs inputs(
-        root_layer(),
-        DrawViewportSize(),
-        layer_tree_host_impl_->DrawTransform(),
-        device_scale_factor(),
-        total_page_scale_factor(),
-        page_scale_layer,
-        MaxTextureSize(),
-        settings().can_use_lcd_text,
-        can_render_to_separate_surface,
-        settings().layer_transforms_should_scale_layer_contents,
-        &render_surface_layer_list_,
-        render_surface_layer_list_id_);
-    LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+    if (layer_tree_host_impl_->IsTesting()) {
+      LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
+          root_layer(),
+          DrawViewportSize(),
+          layer_tree_host_impl_->DrawTransform(),
+          device_scale_factor(),
+          total_page_scale_factor(),
+          page_scale_layer,
+          MaxTextureSize(),
+          settings().can_use_lcd_text,
+          can_render_to_separate_surface,
+          settings().layer_transforms_should_scale_layer_contents,
+          &render_surface_layer_list_,
+          render_surface_layer_list_id_);
+      LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+    } else {
+      LayerTreeHostCommon::CalcDrawPropsImplInputs inputs(
+          root_layer(),
+          DrawViewportSize(),
+          layer_tree_host_impl_->DrawTransform(),
+          device_scale_factor(),
+          total_page_scale_factor(),
+          page_scale_layer,
+          MaxTextureSize(),
+          settings().can_use_lcd_text,
+          can_render_to_separate_surface,
+          settings().layer_transforms_should_scale_layer_contents,
+          &render_surface_layer_list_,
+          render_surface_layer_list_id_);
+      LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+    }
   }
 
   {