Reuse property trees

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 87 matching lines @@
         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);
 
    private:
     const gfx::Transform identity_transform_;
-    PropertyTrees property_trees;
+    PropertyTrees temporary_property_trees;
   };
 
   typedef CalcDrawPropsInputs<Layer, RenderSurfaceLayerList>
       CalcDrawPropsMainInputs;
   typedef CalcDrawPropsInputsForTesting<Layer, RenderSurfaceLayerList>
       CalcDrawPropsMainInputsForTesting;
   static void UpdateRenderSurfaces(Layer* root_layer,
                                    bool can_render_to_separate_surface,
                                    const gfx::Transform& transform,
                                    bool preserves_2d_axis_alignment);
@@ skipping 107 matching lines @@
     if (LayerType* mask_layer = replica_layer->mask_layer())
       function(mask_layer);
   }
 
   for (size_t i = 0; i < layer->children().size(); ++i) {
     CallFunctionForSubtree(get_layer_as_raw_ptr(layer->children(), i),
                            function);
   }
 }
 
+CC_EXPORT PropertyTrees* GetPropertyTrees(Layer* layer,
+                                          PropertyTrees* trees_from_inputs);
+CC_EXPORT PropertyTrees* GetPropertyTrees(LayerImpl* layer,
+                                          PropertyTrees* trees_from_inputs);
+
 template <typename LayerType, typename RenderSurfaceLayerListType>
 LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
                                                    RenderSurfaceLayerListType>::
     CalcDrawPropsInputsForTesting(
         LayerType* root_layer,
         const gfx::Size& device_viewport_size,
         const gfx::Transform& device_transform,
         RenderSurfaceLayerListType* render_surface_layer_list)
     : CalcDrawPropsInputs<LayerType, RenderSurfaceLayerListType>(
           root_layer,
           device_viewport_size,
           device_transform,
           1.f,
           1.f,
           NULL,
           gfx::Vector2dF(),
           NULL,
           std::numeric_limits<int>::max() / 2,
           false,
           false,
           true,
           false,
           true,
           render_surface_layer_list,
           0,
-          &property_trees) {
+          GetPropertyTrees(root_layer, &temporary_property_trees)) {
   DCHECK(root_layer);
   DCHECK(render_surface_layer_list);
 }
 
 template <typename LayerType, typename RenderSurfaceLayerListType>
 LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
                                                    RenderSurfaceLayerListType>::
     CalcDrawPropsInputsForTesting(
         LayerType* root_layer,
         const gfx::Size& device_viewport_size,
         RenderSurfaceLayerListType* render_surface_layer_list)
     : CalcDrawPropsInputs<LayerType, RenderSurfaceLayerListType>(
           root_layer,
           device_viewport_size,
           identity_transform_,
           1.f,
           1.f,
           NULL,
           gfx::Vector2dF(),
           NULL,
           std::numeric_limits<int>::max() / 2,
           false,
           false,
           true,
           false,
           true,
           render_surface_layer_list,
           0,
-          &property_trees) {
+          GetPropertyTrees(root_layer, &temporary_property_trees)) {
   DCHECK(root_layer);
   DCHECK(render_surface_layer_list);
 }
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_HOST_COMMON_H_