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 <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <set> | 9 #include <set> |
10 | 10 |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 | 185 |
186 render_surface_layer_list_.clear(); | 186 render_surface_layer_list_.clear(); |
187 set_needs_update_draw_properties(); | 187 set_needs_update_draw_properties(); |
188 return root_layer_.Pass(); | 188 return root_layer_.Pass(); |
189 } | 189 } |
190 | 190 |
191 void LayerTreeImpl::PushPropertiesTo(LayerTreeImpl* target_tree) { | 191 void LayerTreeImpl::PushPropertiesTo(LayerTreeImpl* target_tree) { |
192 // The request queue should have been processed and does not require a push. | 192 // The request queue should have been processed and does not require a push. |
193 DCHECK_EQ(ui_resource_request_queue_.size(), 0u); | 193 DCHECK_EQ(ui_resource_request_queue_.size(), 0u); |
194 | 194 |
| 195 target_tree->SetPropertyTrees(property_trees_); |
| 196 |
195 if (next_activation_forces_redraw_) { | 197 if (next_activation_forces_redraw_) { |
196 target_tree->ForceRedrawNextActivation(); | 198 target_tree->ForceRedrawNextActivation(); |
197 next_activation_forces_redraw_ = false; | 199 next_activation_forces_redraw_ = false; |
198 } | 200 } |
199 | 201 |
200 target_tree->PassSwapPromises(&swap_promise_list_); | 202 target_tree->PassSwapPromises(&swap_promise_list_); |
201 | 203 |
202 target_tree->set_top_controls_shrink_blink_size( | 204 target_tree->set_top_controls_shrink_blink_size( |
203 top_controls_shrink_blink_size_); | 205 top_controls_shrink_blink_size_); |
204 target_tree->set_top_controls_height(top_controls_height_); | 206 target_tree->set_top_controls_height(top_controls_height_); |
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
533 "cc", "LayerTreeImpl::UpdateDrawProperties::CalculateDrawProperties", | 535 "cc", "LayerTreeImpl::UpdateDrawProperties::CalculateDrawProperties", |
534 "IsActive", IsActiveTree(), "SourceFrameNumber", source_frame_number_); | 536 "IsActive", IsActiveTree(), "SourceFrameNumber", source_frame_number_); |
535 LayerImpl* page_scale_layer = | 537 LayerImpl* page_scale_layer = |
536 page_scale_layer_ ? page_scale_layer_ : InnerViewportContainerLayer(); | 538 page_scale_layer_ ? page_scale_layer_ : InnerViewportContainerLayer(); |
537 bool can_render_to_separate_surface = | 539 bool can_render_to_separate_surface = |
538 (layer_tree_host_impl_->GetDrawMode() != | 540 (layer_tree_host_impl_->GetDrawMode() != |
539 DRAW_MODE_RESOURCELESS_SOFTWARE); | 541 DRAW_MODE_RESOURCELESS_SOFTWARE); |
540 | 542 |
541 ++render_surface_layer_list_id_; | 543 ++render_surface_layer_list_id_; |
542 | 544 |
543 // TODO(enne): Synchronize property trees to compositor thread and use | |
544 // them here. | |
545 PropertyTrees* property_trees = nullptr; | |
546 LayerTreeHostCommon::CalcDrawPropsImplInputs inputs( | 545 LayerTreeHostCommon::CalcDrawPropsImplInputs inputs( |
547 root_layer(), DrawViewportSize(), | 546 root_layer(), DrawViewportSize(), |
548 layer_tree_host_impl_->DrawTransform(), device_scale_factor(), | 547 layer_tree_host_impl_->DrawTransform(), device_scale_factor(), |
549 current_page_scale_factor(), page_scale_layer, | 548 current_page_scale_factor(), page_scale_layer, |
550 elastic_overscroll()->Current(IsActiveTree()), | 549 elastic_overscroll()->Current(IsActiveTree()), |
551 overscroll_elasticity_layer_, resource_provider()->max_texture_size(), | 550 overscroll_elasticity_layer_, resource_provider()->max_texture_size(), |
552 settings().can_use_lcd_text, settings().layers_always_allowed_lcd_text, | 551 settings().can_use_lcd_text, settings().layers_always_allowed_lcd_text, |
553 can_render_to_separate_surface, | 552 can_render_to_separate_surface, |
554 settings().layer_transforms_should_scale_layer_contents, | 553 settings().layer_transforms_should_scale_layer_contents, |
555 settings().verify_property_trees, &render_surface_layer_list_, | 554 settings().verify_property_trees, &render_surface_layer_list_, |
556 render_surface_layer_list_id_, property_trees); | 555 render_surface_layer_list_id_, &property_trees_); |
557 LayerTreeHostCommon::CalculateDrawProperties(&inputs); | 556 LayerTreeHostCommon::CalculateDrawProperties(&inputs); |
558 } | 557 } |
559 | 558 |
560 { | 559 { |
561 TRACE_EVENT2("cc", "LayerTreeImpl::UpdateDrawProperties::Occlusion", | 560 TRACE_EVENT2("cc", "LayerTreeImpl::UpdateDrawProperties::Occlusion", |
562 "IsActive", IsActiveTree(), "SourceFrameNumber", | 561 "IsActive", IsActiveTree(), "SourceFrameNumber", |
563 source_frame_number_); | 562 source_frame_number_); |
564 OcclusionTracker<LayerImpl> occlusion_tracker( | 563 OcclusionTracker<LayerImpl> occlusion_tracker( |
565 root_layer()->render_surface()->content_rect()); | 564 root_layer()->render_surface()->content_rect()); |
566 occlusion_tracker.set_minimum_tracking_size( | 565 occlusion_tracker.set_minimum_tracking_size( |
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1568 scoped_ptr<PendingPageScaleAnimation> pending_animation) { | 1567 scoped_ptr<PendingPageScaleAnimation> pending_animation) { |
1569 pending_page_scale_animation_ = pending_animation.Pass(); | 1568 pending_page_scale_animation_ = pending_animation.Pass(); |
1570 } | 1569 } |
1571 | 1570 |
1572 scoped_ptr<PendingPageScaleAnimation> | 1571 scoped_ptr<PendingPageScaleAnimation> |
1573 LayerTreeImpl::TakePendingPageScaleAnimation() { | 1572 LayerTreeImpl::TakePendingPageScaleAnimation() { |
1574 return pending_page_scale_animation_.Pass(); | 1573 return pending_page_scale_animation_.Pass(); |
1575 } | 1574 } |
1576 | 1575 |
1577 } // namespace cc | 1576 } // namespace cc |
OLD | NEW |