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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 | 10 |
(...skipping 2781 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2792 inputs->root_layer, inputs->page_scale_layer, | 2792 inputs->root_layer, inputs->page_scale_layer, |
2793 inputs->inner_viewport_scroll_layer, inputs->outer_viewport_scroll_layer, | 2793 inputs->inner_viewport_scroll_layer, inputs->outer_viewport_scroll_layer, |
2794 overscroll_elasticity_layer, elastic_overscroll, | 2794 overscroll_elasticity_layer, elastic_overscroll, |
2795 inputs->page_scale_factor, inputs->device_scale_factor, | 2795 inputs->page_scale_factor, inputs->device_scale_factor, |
2796 gfx::Rect(inputs->device_viewport_size), inputs->device_transform, | 2796 gfx::Rect(inputs->device_viewport_size), inputs->device_transform, |
2797 can_render_to_separate_surface, property_trees, &update_layer_list); | 2797 can_render_to_separate_surface, property_trees, &update_layer_list); |
2798 } | 2798 } |
2799 | 2799 |
2800 void LayerTreeHostCommon::CalculateDrawProperties( | 2800 void LayerTreeHostCommon::CalculateDrawProperties( |
2801 CalcDrawPropsImplInputs* inputs) { | 2801 CalcDrawPropsImplInputs* inputs) { |
| 2802 TRACE_EVENT0("compositor-worker", "LayerTreeHostCommon::CalcDrawProperties"); |
2802 CalculateDrawPropertiesAndVerify(inputs, DONT_BUILD_PROPERTY_TREES); | 2803 CalculateDrawPropertiesAndVerify(inputs, DONT_BUILD_PROPERTY_TREES); |
2803 | 2804 |
2804 if (CdpPerfTracingEnabled()) { | 2805 if (CdpPerfTracingEnabled()) { |
2805 LayerTreeImpl* layer_tree_impl = inputs->root_layer->layer_tree_impl(); | 2806 LayerTreeImpl* layer_tree_impl = inputs->root_layer->layer_tree_impl(); |
2806 if (layer_tree_impl->IsPendingTree() && | 2807 if (layer_tree_impl->IsPendingTree() && |
2807 layer_tree_impl->is_first_frame_after_commit()) { | 2808 layer_tree_impl->is_first_frame_after_commit()) { |
2808 LayerImpl* active_tree_root = | 2809 LayerImpl* active_tree_root = |
2809 layer_tree_impl->FindActiveTreeLayerById(inputs->root_layer->id()); | 2810 layer_tree_impl->FindActiveTreeLayerById(inputs->root_layer->id()); |
2810 float jitter = 0.f; | 2811 float jitter = 0.f; |
2811 if (active_tree_root) { | 2812 if (active_tree_root) { |
2812 LayerImpl* last_scrolled_layer = layer_tree_impl->LayerById( | 2813 LayerImpl* last_scrolled_layer = layer_tree_impl->LayerById( |
2813 active_tree_root->layer_tree_impl()->LastScrolledLayerId()); | 2814 active_tree_root->layer_tree_impl()->LastScrolledLayerId()); |
2814 jitter = CalculateFrameJitter(last_scrolled_layer); | 2815 jitter = CalculateFrameJitter(last_scrolled_layer); |
2815 } | 2816 } |
2816 TRACE_COUNTER1(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), "jitter", | 2817 TRACE_COUNTER1(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), "jitter", |
2817 jitter); | 2818 jitter); |
2818 inputs->root_layer->layer_tree_impl()->set_is_first_frame_after_commit( | 2819 inputs->root_layer->layer_tree_impl()->set_is_first_frame_after_commit( |
2819 false); | 2820 false); |
2820 } | 2821 } |
2821 } | 2822 } |
2822 } | 2823 } |
2823 | 2824 |
2824 void LayerTreeHostCommon::CalculateDrawProperties( | 2825 void LayerTreeHostCommon::CalculateDrawProperties( |
2825 CalcDrawPropsImplInputsForTesting* inputs) { | 2826 CalcDrawPropsImplInputsForTesting* inputs) { |
| 2827 TRACE_EVENT0("compositor-worker", "LayerTreeHostCommon::CalcDrawProperties"); |
2826 CalculateDrawPropertiesAndVerify(inputs, BUILD_PROPERTY_TREES_IF_NEEDED); | 2828 CalculateDrawPropertiesAndVerify(inputs, BUILD_PROPERTY_TREES_IF_NEEDED); |
2827 } | 2829 } |
2828 | 2830 |
2829 PropertyTrees* GetPropertyTrees(Layer* layer) { | 2831 PropertyTrees* GetPropertyTrees(Layer* layer) { |
2830 return layer->layer_tree_host()->property_trees(); | 2832 return layer->layer_tree_host()->property_trees(); |
2831 } | 2833 } |
2832 | 2834 |
2833 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { | 2835 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { |
2834 return layer->layer_tree_impl()->property_trees(); | 2836 return layer->layer_tree_impl()->property_trees(); |
2835 } | 2837 } |
2836 | 2838 |
2837 } // namespace cc | 2839 } // namespace cc |
OLD | NEW |