Moving RenderSurface creation outside of CalcDrawProps

cc/trees/layer_tree_impl.cc

 // 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.
 
 #include "cc/trees/layer_tree_impl.h"
 
 #include <limits>
 #include <set>
 
 #include "base/debug/trace_event.h"
@@ skipping 450 matching lines @@
                  "LayerTreeImpl::UpdateDrawProperties",
                  "IsActive",
                  IsActiveTree(),
                  "SourceFrameNumber",
                  source_frame_number_);
     LayerImpl* page_scale_layer =
         page_scale_layer_ ? page_scale_layer_ : InnerViewportContainerLayer();
     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);
+    }
   }
 
   {
     TRACE_EVENT2("cc",
                  "LayerTreeImpl::UpdateTilePriorities",
                  "IsActive",
                  IsActiveTree(),
                  "SourceFrameNumber",
                  source_frame_number_);
     scoped_ptr<OcclusionTracker<LayerImpl> > occlusion_tracker;
@@ skipping 901 matching lines @@
 
 void LayerTreeImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) {
   layer_tree_host_impl_->UnregisterPictureLayerImpl(layer);
 }
 
 void LayerTreeImpl::InputScrollAnimationFinished() {
   layer_tree_host_impl_->ScrollEnd();
 }
 
 }  // namespace cc