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 <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <algorithm> | 10 #include <algorithm> |
(...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
648 | 648 |
649 Layer* root_scroll = | 649 Layer* root_scroll = |
650 PropertyTreeBuilder::FindFirstScrollableLayer(root_layer); | 650 PropertyTreeBuilder::FindFirstScrollableLayer(root_layer); |
651 Layer* page_scale_layer = page_scale_layer_.get(); | 651 Layer* page_scale_layer = page_scale_layer_.get(); |
652 if (!page_scale_layer && root_scroll) | 652 if (!page_scale_layer && root_scroll) |
653 page_scale_layer = root_scroll->parent(); | 653 page_scale_layer = root_scroll->parent(); |
654 | 654 |
655 if (hud_layer_) { | 655 if (hud_layer_) { |
656 hud_layer_->PrepareForCalculateDrawProperties(device_viewport_size_, | 656 hud_layer_->PrepareForCalculateDrawProperties(device_viewport_size_, |
657 device_scale_factor_); | 657 device_scale_factor_); |
| 658 // The HUD layer is managed outside the layer list sent to LayerTreeHost |
| 659 // and needs to have its property tree state set. |
| 660 if (settings_.use_layer_lists && root_layer_.get()) { |
| 661 hud_layer_->SetTransformTreeIndex(root_layer_->transform_tree_index()); |
| 662 hud_layer_->SetEffectTreeIndex(root_layer_->effect_tree_index()); |
| 663 hud_layer_->SetClipTreeIndex(root_layer_->clip_tree_index()); |
| 664 hud_layer_->SetScrollTreeIndex(root_layer_->scroll_tree_index()); |
| 665 hud_layer_->set_property_tree_sequence_number( |
| 666 root_layer_->property_tree_sequence_number()); |
| 667 } |
658 } | 668 } |
659 | 669 |
660 gfx::Transform identity_transform; | 670 gfx::Transform identity_transform; |
661 LayerList update_layer_list; | 671 LayerList update_layer_list; |
662 | 672 |
663 { | 673 { |
664 base::AutoReset<bool> update_property_trees(&in_update_property_trees_, | 674 base::AutoReset<bool> update_property_trees(&in_update_property_trees_, |
665 true); | 675 true); |
666 TRACE_EVENT0("cc", | 676 TRACE_EVENT0("cc", |
667 "LayerTreeHostInProcess::UpdateLayers::BuildPropertyTrees"); | 677 "LayerTreeHostInProcess::UpdateLayers::BuildPropertyTrees"); |
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1346 LayerListReverseIterator<Layer> LayerTreeHost::rend() { | 1356 LayerListReverseIterator<Layer> LayerTreeHost::rend() { |
1347 return LayerListReverseIterator<Layer>(nullptr); | 1357 return LayerListReverseIterator<Layer>(nullptr); |
1348 } | 1358 } |
1349 | 1359 |
1350 void LayerTreeHost::SetNeedsDisplayOnAllLayers() { | 1360 void LayerTreeHost::SetNeedsDisplayOnAllLayers() { |
1351 for (auto* layer : *this) | 1361 for (auto* layer : *this) |
1352 layer->SetNeedsDisplay(); | 1362 layer->SetNeedsDisplay(); |
1353 } | 1363 } |
1354 | 1364 |
1355 } // namespace cc | 1365 } // namespace cc |
OLD | NEW |