Reuse property trees

cc/trees/layer_tree_host_common.h

Index: cc/trees/layer_tree_host_common.h
diff --git a/cc/trees/layer_tree_host_common.h b/cc/trees/layer_tree_host_common.h
index 030d07a8adc1852aec32c692f37d7823b9d5245e..f0378dff734795d2e34dbc169a4506ae0401e04c 100644
--- a/cc/trees/layer_tree_host_common.h
+++ b/cc/trees/layer_tree_host_common.h
@@ -105,7 +105,7 @@ class CC_EXPORT LayerTreeHostCommon {
 
    private:
     const gfx::Transform identity_transform_;
-    PropertyTrees property_trees;
+    PropertyTrees temporary_property_trees;
   };
 
   typedef CalcDrawPropsInputs<Layer, RenderSurfaceLayerList>
@@ -233,6 +233,11 @@ void LayerTreeHostCommon::CallFunctionForSubtree(LayerType* layer,
   }
 }
 
+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>::
@@ -258,7 +263,7 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
           true,
           render_surface_layer_list,
           0,
-          &property_trees) {
+          GetPropertyTrees(root_layer, &temporary_property_trees)) {
   DCHECK(root_layer);
   DCHECK(render_surface_layer_list);
 }
@@ -287,7 +292,7 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
           true,
           render_surface_layer_list,
           0,
-          &property_trees) {
+          GetPropertyTrees(root_layer, &temporary_property_trees)) {
   DCHECK(root_layer);
   DCHECK(render_surface_layer_list);
 }