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 7d90445023f4c83eddd68a4a18de20035f8222e8..5b5db610de3e3b5fcde9aa747451cceee4cf66f7 100644 |
--- a/cc/trees/layer_tree_host_common.h |
+++ b/cc/trees/layer_tree_host_common.h |
@@ -102,9 +102,6 @@ class CC_EXPORT LayerTreeHostCommon { |
LayerType* root_layer, |
const gfx::Size& device_viewport_size, |
RenderSurfaceLayerListType* render_surface_layer_list); |
- |
- private: |
- PropertyTrees temporary_property_trees; |
}; |
typedef CalcDrawPropsInputs<Layer, RenderSurfaceLayerList> |
@@ -235,10 +232,8 @@ 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); |
+CC_EXPORT PropertyTrees* GetPropertyTrees(Layer* layer); |
+CC_EXPORT PropertyTrees* GetPropertyTrees(LayerImpl* layer); |
template <typename LayerType, typename RenderSurfaceLayerListType> |
LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType, |
@@ -265,7 +260,7 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType, |
true, |
render_surface_layer_list, |
0, |
- GetPropertyTrees(root_layer, &temporary_property_trees)) { |
+ GetPropertyTrees(root_layer)) { |
DCHECK(root_layer); |
DCHECK(render_surface_layer_list); |
} |
@@ -294,7 +289,7 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType, |
true, |
render_surface_layer_list, |
0, |
- GetPropertyTrees(root_layer, &temporary_property_trees)) { |
+ GetPropertyTrees(root_layer)) { |
DCHECK(root_layer); |
DCHECK(render_surface_layer_list); |
} |