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 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
434 target_tree->set_top_controls_height(top_controls_height_); | 434 target_tree->set_top_controls_height(top_controls_height_); |
435 target_tree->set_bottom_controls_height(bottom_controls_height_); | 435 target_tree->set_bottom_controls_height(bottom_controls_height_); |
436 target_tree->PushTopControls(nullptr); | 436 target_tree->PushTopControls(nullptr); |
437 | 437 |
438 // Active tree already shares the page_scale_factor object with pending | 438 // Active tree already shares the page_scale_factor object with pending |
439 // tree so only the limits need to be provided. | 439 // tree so only the limits need to be provided. |
440 target_tree->PushPageScaleFactorAndLimits(nullptr, min_page_scale_factor(), | 440 target_tree->PushPageScaleFactorAndLimits(nullptr, min_page_scale_factor(), |
441 max_page_scale_factor()); | 441 max_page_scale_factor()); |
442 target_tree->SetDeviceScaleFactor(device_scale_factor()); | 442 target_tree->SetDeviceScaleFactor(device_scale_factor()); |
443 target_tree->set_painted_device_scale_factor(painted_device_scale_factor()); | 443 target_tree->set_painted_device_scale_factor(painted_device_scale_factor()); |
444 target_tree->SetDeviceColorSpace(device_color_space_); | |
444 target_tree->elastic_overscroll()->PushPendingToActive(); | 445 target_tree->elastic_overscroll()->PushPendingToActive(); |
445 | 446 |
446 target_tree->pending_page_scale_animation_ = | 447 target_tree->pending_page_scale_animation_ = |
447 std::move(pending_page_scale_animation_); | 448 std::move(pending_page_scale_animation_); |
448 | 449 |
449 target_tree->SetViewportLayersFromIds( | 450 target_tree->SetViewportLayersFromIds( |
450 overscroll_elasticity_layer_id_, page_scale_layer_id_, | 451 overscroll_elasticity_layer_id_, page_scale_layer_id_, |
451 inner_viewport_scroll_layer_id_, outer_viewport_scroll_layer_id_); | 452 inner_viewport_scroll_layer_id_, outer_viewport_scroll_layer_id_); |
452 | 453 |
453 target_tree->RegisterSelection(selection_); | 454 target_tree->RegisterSelection(selection_); |
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
838 | 839 |
839 set_needs_update_draw_properties(); | 840 set_needs_update_draw_properties(); |
840 DidUpdateScrollState(inner_viewport_scroll_layer_id_); | 841 DidUpdateScrollState(inner_viewport_scroll_layer_id_); |
841 } | 842 } |
842 | 843 |
843 void LayerTreeImpl::SetDeviceScaleFactor(float device_scale_factor) { | 844 void LayerTreeImpl::SetDeviceScaleFactor(float device_scale_factor) { |
844 if (device_scale_factor == device_scale_factor_) | 845 if (device_scale_factor == device_scale_factor_) |
845 return; | 846 return; |
846 device_scale_factor_ = device_scale_factor; | 847 device_scale_factor_ = device_scale_factor; |
847 | 848 |
848 set_needs_update_draw_properties(); | 849 // set_needs_update_draw_properties(); |
enne (OOO)
2016/09/09 17:44:47
?
ccameron
2016/09/09 17:48:18
Oooooops, I was verifying that the tests would act
| |
849 if (IsActiveTree()) | 850 if (IsActiveTree()) |
850 layer_tree_host_impl_->SetFullViewportDamage(); | 851 layer_tree_host_impl_->SetFullViewportDamage(); |
851 } | 852 } |
853 | |
854 void LayerTreeImpl::SetDeviceColorSpace( | |
855 const gfx::ColorSpace& device_color_space) { | |
856 if (device_color_space == device_color_space_) | |
857 return; | |
858 device_color_space_ = device_color_space; | |
859 | |
860 if (IsActiveTree()) | |
861 layer_tree_host_impl_->SetFullViewportDamage(); | |
862 } | |
852 | 863 |
853 SyncedProperty<ScaleGroup>* LayerTreeImpl::page_scale_factor() { | 864 SyncedProperty<ScaleGroup>* LayerTreeImpl::page_scale_factor() { |
854 return page_scale_factor_.get(); | 865 return page_scale_factor_.get(); |
855 } | 866 } |
856 | 867 |
857 const SyncedProperty<ScaleGroup>* LayerTreeImpl::page_scale_factor() const { | 868 const SyncedProperty<ScaleGroup>* LayerTreeImpl::page_scale_factor() const { |
858 return page_scale_factor_.get(); | 869 return page_scale_factor_.get(); |
859 } | 870 } |
860 | 871 |
861 gfx::SizeF LayerTreeImpl::ScrollableViewportSize() const { | 872 gfx::SizeF LayerTreeImpl::ScrollableViewportSize() const { |
(...skipping 1214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2076 | 2087 |
2077 void LayerTreeImpl::ResetAllChangeTracking() { | 2088 void LayerTreeImpl::ResetAllChangeTracking() { |
2078 layers_that_should_push_properties_.clear(); | 2089 layers_that_should_push_properties_.clear(); |
2079 // Iterate over all layers, including masks and replicas. | 2090 // Iterate over all layers, including masks and replicas. |
2080 for (auto& layer : *layers_) | 2091 for (auto& layer : *layers_) |
2081 layer->ResetChangeTracking(); | 2092 layer->ResetChangeTracking(); |
2082 property_trees_.ResetAllChangeTracking(); | 2093 property_trees_.ResetAllChangeTracking(); |
2083 } | 2094 } |
2084 | 2095 |
2085 } // namespace cc | 2096 } // namespace cc |
OLD | NEW |