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.h" | 5 #include "cc/trees/layer_tree_host.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <stack> | 8 #include <stack> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 759 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
770 Layer* root_scroll = FindFirstScrollableLayer(root_layer); | 770 Layer* root_scroll = FindFirstScrollableLayer(root_layer); |
771 Layer* page_scale_layer = page_scale_layer_.get(); | 771 Layer* page_scale_layer = page_scale_layer_.get(); |
772 if (!page_scale_layer && root_scroll) | 772 if (!page_scale_layer && root_scroll) |
773 page_scale_layer = root_scroll->parent(); | 773 page_scale_layer = root_scroll->parent(); |
774 | 774 |
775 if (hud_layer_.get()) { | 775 if (hud_layer_.get()) { |
776 hud_layer_->PrepareForCalculateDrawProperties(device_viewport_size(), | 776 hud_layer_->PrepareForCalculateDrawProperties(device_viewport_size(), |
777 device_scale_factor_); | 777 device_scale_factor_); |
778 } | 778 } |
779 | 779 |
780 bool can_render_to_separate_surface = true; | |
781 | 780 |
782 TRACE_EVENT0("cc", "LayerTreeHost::UpdateLayers::CalcDrawProps"); | 781 TRACE_EVENT0("cc", "LayerTreeHost::UpdateLayers::CalcDrawProps"); |
783 | 782 |
784 LayerTreeHostCommon::PreCalculateMetaInformation(root_layer); | 783 LayerTreeHostCommon::PreCalculateMetaInformation(root_layer); |
785 | 784 |
786 bool preserves_2d_axis_alignment = false; | |
787 gfx::Transform identity_transform; | 785 gfx::Transform identity_transform; |
788 LayerList update_layer_list; | 786 LayerList update_layer_list; |
789 | 787 |
790 LayerTreeHostCommon::UpdateRenderSurfaces( | |
791 root_layer, can_render_to_separate_surface, identity_transform, | |
792 preserves_2d_axis_alignment); | |
793 { | 788 { |
794 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), | 789 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), |
795 "LayerTreeHostCommon::ComputeVisibleRectsWithPropertyTrees"); | 790 "LayerTreeHostCommon::ComputeVisibleRectsWithPropertyTrees"); |
| 791 bool can_render_to_separate_surface = true; |
796 BuildPropertyTreesAndComputeVisibleRects( | 792 BuildPropertyTreesAndComputeVisibleRects( |
797 root_layer, page_scale_layer, inner_viewport_scroll_layer_.get(), | 793 root_layer, page_scale_layer, inner_viewport_scroll_layer_.get(), |
798 outer_viewport_scroll_layer_.get(), page_scale_factor_, | 794 outer_viewport_scroll_layer_.get(), page_scale_factor_, |
799 device_scale_factor_, gfx::Rect(device_viewport_size_), | 795 device_scale_factor_, gfx::Rect(device_viewport_size_), |
800 identity_transform, can_render_to_separate_surface, &property_trees_, | 796 identity_transform, can_render_to_separate_surface, &property_trees_, |
801 &update_layer_list); | 797 &update_layer_list); |
802 } | 798 } |
803 | 799 |
804 for (const auto& layer : update_layer_list) | 800 for (const auto& layer : update_layer_list) |
805 layer->SavePaintProperties(); | 801 layer->SavePaintProperties(); |
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1245 return animation_host_ ? animation_host_->HasAnyAnimation(layer->id()) | 1241 return animation_host_ ? animation_host_->HasAnyAnimation(layer->id()) |
1246 : false; | 1242 : false; |
1247 } | 1243 } |
1248 | 1244 |
1249 bool LayerTreeHost::HasActiveAnimation(const Layer* layer) const { | 1245 bool LayerTreeHost::HasActiveAnimation(const Layer* layer) const { |
1250 return animation_host_ ? animation_host_->HasActiveAnimation(layer->id()) | 1246 return animation_host_ ? animation_host_->HasActiveAnimation(layer->id()) |
1251 : false; | 1247 : false; |
1252 } | 1248 } |
1253 | 1249 |
1254 } // namespace cc | 1250 } // namespace cc |
OLD | NEW |