cc: Don't count PreCalculateMetaInformation as part of CalcDrawProps

cc/trees/layer_tree_host_common.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_host_common.h"
 
 #include <algorithm>
 
 #include "base/trace_event/trace_event.h"
 #include "cc/base/math_util.h"
@@ skipping 2478 matching lines @@
     CalcDrawPropsMainInputs* inputs) {
   UpdateRenderSurfaces(inputs->root_layer,
                        inputs->can_render_to_separate_surface, gfx::Transform(),
                        false);
   LayerList dummy_layer_list;
   SubtreeGlobals<Layer> globals;
   DataForRecursion<Layer> data_for_recursion;
   ProcessCalcDrawPropsInputs(*inputs, &globals, &data_for_recursion);
 
   PreCalculateMetaInformationRecursiveData recursive_data;
+  PreCalculateMetaInformation(inputs->root_layer, &recursive_data);
 
   if (!inputs->verify_property_trees) {
-    PreCalculateMetaInformation(inputs->root_layer, &recursive_data);
     std::vector<AccumulatedSurfaceState<Layer>> accumulated_surface_state;
     CalculateDrawPropertiesInternal<Layer>(
         inputs->root_layer, globals, data_for_recursion,
         inputs->render_surface_layer_list, &dummy_layer_list,
         &accumulated_surface_state,
         inputs->current_render_surface_layer_list_id);
   } else {
     {
       TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"),
                    "LayerTreeHostCommon::CalculateDrawProperties");
-      PreCalculateMetaInformation(inputs->root_layer, &recursive_data);
       std::vector<AccumulatedSurfaceState<Layer>> accumulated_surface_state;
       CalculateDrawPropertiesInternal<Layer>(
           inputs->root_layer, globals, data_for_recursion,
           inputs->render_surface_layer_list, &dummy_layer_list,
           &accumulated_surface_state,
           inputs->current_render_surface_layer_list_id);
     }
 
     // The translation from layer to property trees is an intermediate state. We
     // will eventually get these data passed directly to the compositor.
@@ skipping 64 matching lines @@
       inputs->current_render_surface_layer_list_id);
 
   // The dummy layer list should not have been used.
   DCHECK_EQ(0u, dummy_layer_list.size());
   // A root layer render_surface should always exist after
   // CalculateDrawProperties.
   DCHECK(inputs->root_layer->render_surface());
 }
 
 }  // namespace cc