| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/trees/layer_tree_host_common.h" | 5 #include "cc/trees/layer_tree_host_common.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" |
| 10 #include "cc/base/math_util.h" | 10 #include "cc/base/math_util.h" |
| (...skipping 2729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2740 void LayerTreeHostCommon::CalculateDrawProperties( | 2740 void LayerTreeHostCommon::CalculateDrawProperties( |
| 2741 CalcDrawPropsImplInputs* inputs) { | 2741 CalcDrawPropsImplInputs* inputs) { |
| 2742 CalculateDrawPropertiesAndVerify(inputs, DONT_BUILD_PROPERTY_TREES); | 2742 CalculateDrawPropertiesAndVerify(inputs, DONT_BUILD_PROPERTY_TREES); |
| 2743 } | 2743 } |
| 2744 | 2744 |
| 2745 void LayerTreeHostCommon::CalculateDrawProperties( | 2745 void LayerTreeHostCommon::CalculateDrawProperties( |
| 2746 CalcDrawPropsImplInputsForTesting* inputs) { | 2746 CalcDrawPropsImplInputsForTesting* inputs) { |
| 2747 CalculateDrawPropertiesAndVerify(inputs, BUILD_PROPERTY_TREES_IF_NEEDED); | 2747 CalculateDrawPropertiesAndVerify(inputs, BUILD_PROPERTY_TREES_IF_NEEDED); |
| 2748 } | 2748 } |
| 2749 | 2749 |
| 2750 PropertyTrees* GetPropertyTrees(Layer* layer, | 2750 PropertyTrees* GetPropertyTrees(Layer* layer) { |
| 2751 PropertyTrees* trees_from_inputs) { | |
| 2752 return layer->layer_tree_host()->property_trees(); | 2751 return layer->layer_tree_host()->property_trees(); |
| 2753 } | 2752 } |
| 2754 | 2753 |
| 2755 PropertyTrees* GetPropertyTrees(LayerImpl* layer, | 2754 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { |
| 2756 PropertyTrees* trees_from_inputs) { | 2755 return layer->layer_tree_impl()->property_trees(); |
| 2757 return trees_from_inputs; | |
| 2758 } | 2756 } |
| 2759 | 2757 |
| 2760 } // namespace cc | 2758 } // namespace cc |
| OLD | NEW |