| 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 2739 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2750 inputs->root_layer, inputs->page_scale_layer, | 2750 inputs->root_layer, inputs->page_scale_layer, |
| 2751 inputs->inner_viewport_scroll_layer, inputs->outer_viewport_scroll_layer, | 2751 inputs->inner_viewport_scroll_layer, inputs->outer_viewport_scroll_layer, |
| 2752 overscroll_elasticity_layer, elastic_overscroll, | 2752 overscroll_elasticity_layer, elastic_overscroll, |
| 2753 inputs->page_scale_factor, inputs->device_scale_factor, | 2753 inputs->page_scale_factor, inputs->device_scale_factor, |
| 2754 gfx::Rect(inputs->device_viewport_size), inputs->device_transform, | 2754 gfx::Rect(inputs->device_viewport_size), inputs->device_transform, |
| 2755 can_render_to_separate_surface, property_trees, &update_layer_list); | 2755 can_render_to_separate_surface, property_trees, &update_layer_list); |
| 2756 } | 2756 } |
| 2757 | 2757 |
| 2758 void LayerTreeHostCommon::CalculateDrawProperties( | 2758 void LayerTreeHostCommon::CalculateDrawProperties( |
| 2759 CalcDrawPropsImplInputs* inputs) { | 2759 CalcDrawPropsImplInputs* inputs) { |
| 2760 TRACE_EVENT0("compositor-worker", "LayerTreeHostCommon::CalcDrawProperties"); |
| 2760 CalculateDrawPropertiesAndVerify(inputs, DONT_BUILD_PROPERTY_TREES); | 2761 CalculateDrawPropertiesAndVerify(inputs, DONT_BUILD_PROPERTY_TREES); |
| 2761 | 2762 |
| 2762 if (CdpPerfTracingEnabled()) { | 2763 if (CdpPerfTracingEnabled()) { |
| 2763 LayerTreeImpl* layer_tree_impl = inputs->root_layer->layer_tree_impl(); | 2764 LayerTreeImpl* layer_tree_impl = inputs->root_layer->layer_tree_impl(); |
| 2764 if (layer_tree_impl->IsPendingTree() && | 2765 if (layer_tree_impl->IsPendingTree() && |
| 2765 layer_tree_impl->is_first_frame_after_commit()) { | 2766 layer_tree_impl->is_first_frame_after_commit()) { |
| 2766 LayerImpl* active_tree_root = | 2767 LayerImpl* active_tree_root = |
| 2767 layer_tree_impl->FindActiveTreeLayerById(inputs->root_layer->id()); | 2768 layer_tree_impl->FindActiveTreeLayerById(inputs->root_layer->id()); |
| 2768 float jitter = 0.f; | 2769 float jitter = 0.f; |
| 2769 if (active_tree_root) { | 2770 if (active_tree_root) { |
| 2770 LayerImpl* last_scrolled_layer = layer_tree_impl->LayerById( | 2771 LayerImpl* last_scrolled_layer = layer_tree_impl->LayerById( |
| 2771 active_tree_root->layer_tree_impl()->LastScrolledLayerId()); | 2772 active_tree_root->layer_tree_impl()->LastScrolledLayerId()); |
| 2772 jitter = CalculateFrameJitter(last_scrolled_layer); | 2773 jitter = CalculateFrameJitter(last_scrolled_layer); |
| 2773 } | 2774 } |
| 2774 TRACE_COUNTER1(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), "jitter", | 2775 TRACE_COUNTER1(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), "jitter", |
| 2775 jitter); | 2776 jitter); |
| 2776 inputs->root_layer->layer_tree_impl()->set_is_first_frame_after_commit( | 2777 inputs->root_layer->layer_tree_impl()->set_is_first_frame_after_commit( |
| 2777 false); | 2778 false); |
| 2778 } | 2779 } |
| 2779 } | 2780 } |
| 2780 } | 2781 } |
| 2781 | 2782 |
| 2782 void LayerTreeHostCommon::CalculateDrawProperties( | 2783 void LayerTreeHostCommon::CalculateDrawProperties( |
| 2783 CalcDrawPropsImplInputsForTesting* inputs) { | 2784 CalcDrawPropsImplInputsForTesting* inputs) { |
| 2785 TRACE_EVENT0("compositor-worker", "LayerTreeHostCommon::CalcDrawProperties"); |
| 2784 CalculateDrawPropertiesAndVerify(inputs, BUILD_PROPERTY_TREES_IF_NEEDED); | 2786 CalculateDrawPropertiesAndVerify(inputs, BUILD_PROPERTY_TREES_IF_NEEDED); |
| 2785 } | 2787 } |
| 2786 | 2788 |
| 2787 PropertyTrees* GetPropertyTrees(Layer* layer) { | 2789 PropertyTrees* GetPropertyTrees(Layer* layer) { |
| 2788 return layer->layer_tree_host()->property_trees(); | 2790 return layer->layer_tree_host()->property_trees(); |
| 2789 } | 2791 } |
| 2790 | 2792 |
| 2791 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { | 2793 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { |
| 2792 return layer->layer_tree_impl()->property_trees(); | 2794 return layer->layer_tree_impl()->property_trees(); |
| 2793 } | 2795 } |
| 2794 | 2796 |
| 2795 } // namespace cc | 2797 } // namespace cc |
| OLD | NEW |