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 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
575 inputs->render_surface_list, inputs->can_render_to_separate_surface, | 575 inputs->render_surface_list, inputs->can_render_to_separate_surface, |
576 inputs->max_texture_size); | 576 inputs->max_texture_size); |
577 | 577 |
578 if (should_measure_property_tree_performance) { | 578 if (should_measure_property_tree_performance) { |
579 TRACE_EVENT_END0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), | 579 TRACE_EVENT_END0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), |
580 "LayerTreeHostCommon::CalculateDrawProperties"); | 580 "LayerTreeHostCommon::CalculateDrawProperties"); |
581 } | 581 } |
582 | 582 |
583 // A root layer render_surface should always exist after | 583 // A root layer render_surface should always exist after |
584 // CalculateDrawProperties. | 584 // CalculateDrawProperties. |
585 DCHECK(inputs->root_layer->GetRenderSurface()); | 585 DCHECK(inputs->property_trees->effect_tree.GetRenderSurface( |
| 586 EffectTree::kContentsRootNodeId)); |
586 } | 587 } |
587 | 588 |
588 void LayerTreeHostCommon::CalculateDrawPropertiesForTesting( | 589 void LayerTreeHostCommon::CalculateDrawPropertiesForTesting( |
589 CalcDrawPropsMainInputsForTesting* inputs) { | 590 CalcDrawPropsMainInputsForTesting* inputs) { |
590 LayerList update_layer_list; | 591 LayerList update_layer_list; |
591 bool can_render_to_separate_surface = true; | 592 bool can_render_to_separate_surface = true; |
592 PropertyTrees* property_trees = | 593 PropertyTrees* property_trees = |
593 inputs->root_layer->layer_tree_host()->property_trees(); | 594 inputs->root_layer->layer_tree_host()->property_trees(); |
594 Layer* overscroll_elasticity_layer = nullptr; | 595 Layer* overscroll_elasticity_layer = nullptr; |
595 gfx::Vector2dF elastic_overscroll; | 596 gfx::Vector2dF elastic_overscroll; |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
662 | 663 |
663 PropertyTrees* GetPropertyTrees(Layer* layer) { | 664 PropertyTrees* GetPropertyTrees(Layer* layer) { |
664 return layer->layer_tree_host()->property_trees(); | 665 return layer->layer_tree_host()->property_trees(); |
665 } | 666 } |
666 | 667 |
667 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { | 668 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { |
668 return layer->layer_tree_impl()->property_trees(); | 669 return layer->layer_tree_impl()->property_trees(); |
669 } | 670 } |
670 | 671 |
671 } // namespace cc | 672 } // namespace cc |
OLD | NEW |