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_impl.h" | 5 #include "cc/trees/layer_tree_impl.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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 last_scrolled_scroll_node_index_(ScrollTree::kInvalidNodeId), | 66 last_scrolled_scroll_node_index_(ScrollTree::kInvalidNodeId), |
67 overscroll_elasticity_layer_id_(Layer::INVALID_ID), | 67 overscroll_elasticity_layer_id_(Layer::INVALID_ID), |
68 page_scale_layer_id_(Layer::INVALID_ID), | 68 page_scale_layer_id_(Layer::INVALID_ID), |
69 inner_viewport_scroll_layer_id_(Layer::INVALID_ID), | 69 inner_viewport_scroll_layer_id_(Layer::INVALID_ID), |
70 outer_viewport_scroll_layer_id_(Layer::INVALID_ID), | 70 outer_viewport_scroll_layer_id_(Layer::INVALID_ID), |
71 page_scale_factor_(page_scale_factor), | 71 page_scale_factor_(page_scale_factor), |
72 min_page_scale_factor_(0), | 72 min_page_scale_factor_(0), |
73 max_page_scale_factor_(0), | 73 max_page_scale_factor_(0), |
74 device_scale_factor_(1.f), | 74 device_scale_factor_(1.f), |
75 painted_device_scale_factor_(1.f), | 75 painted_device_scale_factor_(1.f), |
| 76 content_source_id_(0), |
76 elastic_overscroll_(elastic_overscroll), | 77 elastic_overscroll_(elastic_overscroll), |
77 layers_(new OwnedLayerImplList), | 78 layers_(new OwnedLayerImplList), |
78 viewport_size_invalid_(false), | 79 viewport_size_invalid_(false), |
79 needs_update_draw_properties_(true), | 80 needs_update_draw_properties_(true), |
80 needs_full_tree_sync_(true), | 81 needs_full_tree_sync_(true), |
81 next_activation_forces_redraw_(false), | 82 next_activation_forces_redraw_(false), |
82 has_ever_been_drawn_(false), | 83 has_ever_been_drawn_(false), |
83 handle_visibility_changed_(false), | 84 handle_visibility_changed_(false), |
84 have_scroll_event_handlers_(false), | 85 have_scroll_event_handlers_(false), |
85 event_listener_properties_(), | 86 event_listener_properties_(), |
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
480 | 481 |
481 // Active tree already shares the page_scale_factor object with pending | 482 // Active tree already shares the page_scale_factor object with pending |
482 // tree so only the limits need to be provided. | 483 // tree so only the limits need to be provided. |
483 target_tree->PushPageScaleFactorAndLimits(nullptr, min_page_scale_factor(), | 484 target_tree->PushPageScaleFactorAndLimits(nullptr, min_page_scale_factor(), |
484 max_page_scale_factor()); | 485 max_page_scale_factor()); |
485 target_tree->SetDeviceScaleFactor(device_scale_factor()); | 486 target_tree->SetDeviceScaleFactor(device_scale_factor()); |
486 target_tree->set_painted_device_scale_factor(painted_device_scale_factor()); | 487 target_tree->set_painted_device_scale_factor(painted_device_scale_factor()); |
487 target_tree->SetDeviceColorSpace(device_color_space_); | 488 target_tree->SetDeviceColorSpace(device_color_space_); |
488 target_tree->elastic_overscroll()->PushPendingToActive(); | 489 target_tree->elastic_overscroll()->PushPendingToActive(); |
489 | 490 |
| 491 target_tree->set_content_source_id(content_source_id()); |
| 492 |
490 target_tree->pending_page_scale_animation_ = | 493 target_tree->pending_page_scale_animation_ = |
491 std::move(pending_page_scale_animation_); | 494 std::move(pending_page_scale_animation_); |
492 | 495 |
493 target_tree->SetViewportLayersFromIds( | 496 target_tree->SetViewportLayersFromIds( |
494 overscroll_elasticity_layer_id_, page_scale_layer_id_, | 497 overscroll_elasticity_layer_id_, page_scale_layer_id_, |
495 inner_viewport_scroll_layer_id_, outer_viewport_scroll_layer_id_); | 498 inner_viewport_scroll_layer_id_, outer_viewport_scroll_layer_id_); |
496 | 499 |
497 target_tree->RegisterSelection(selection_); | 500 target_tree->RegisterSelection(selection_); |
498 | 501 |
499 // This should match the property synchronization in | 502 // This should match the property synchronization in |
(...skipping 1633 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2133 | 2136 |
2134 void LayerTreeImpl::ResetAllChangeTracking() { | 2137 void LayerTreeImpl::ResetAllChangeTracking() { |
2135 layers_that_should_push_properties_.clear(); | 2138 layers_that_should_push_properties_.clear(); |
2136 // Iterate over all layers, including masks. | 2139 // Iterate over all layers, including masks. |
2137 for (auto& layer : *layers_) | 2140 for (auto& layer : *layers_) |
2138 layer->ResetChangeTracking(); | 2141 layer->ResetChangeTracking(); |
2139 property_trees_.ResetAllChangeTracking(); | 2142 property_trees_.ResetAllChangeTracking(); |
2140 } | 2143 } |
2141 | 2144 |
2142 } // namespace cc | 2145 } // namespace cc |
OLD | NEW |