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 718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
729 if (next_activation_forces_redraw_) { | 729 if (next_activation_forces_redraw_) { |
730 layer_tree_host_impl_->SetFullRootLayerDamage(); | 730 layer_tree_host_impl_->SetFullRootLayerDamage(); |
731 next_activation_forces_redraw_ = false; | 731 next_activation_forces_redraw_ = false; |
732 } | 732 } |
733 | 733 |
734 if (scrolling_layer_id_from_previous_tree_) { | 734 if (scrolling_layer_id_from_previous_tree_) { |
735 currently_scrolling_layer_ = LayerTreeHostCommon::FindLayerInSubtree( | 735 currently_scrolling_layer_ = LayerTreeHostCommon::FindLayerInSubtree( |
736 root_layer(), scrolling_layer_id_from_previous_tree_); | 736 root_layer(), scrolling_layer_id_from_previous_tree_); |
737 } | 737 } |
738 | 738 |
739 // Always reset this flag on activation, as we would only have activated | |
740 // if we were in a good state. | |
741 layer_tree_host_impl_->ResetRequiresHighResToDraw(); | |
742 | |
743 if (root_layer()) { | 739 if (root_layer()) { |
744 LayerTreeHostCommon::CallFunctionForSubtree( | 740 LayerTreeHostCommon::CallFunctionForSubtree( |
745 root_layer(), [](LayerImpl* layer) { layer->DidBecomeActive(); }); | 741 root_layer(), [](LayerImpl* layer) { layer->DidBecomeActive(); }); |
746 } | 742 } |
747 | 743 |
748 for (auto* swap_promise : swap_promise_list_) | 744 for (auto* swap_promise : swap_promise_list_) |
749 swap_promise->DidActivate(); | 745 swap_promise->DidActivate(); |
750 devtools_instrumentation::DidActivateLayerTree(layer_tree_host_impl_->id(), | 746 devtools_instrumentation::DidActivateLayerTree(layer_tree_host_impl_->id(), |
751 source_frame_number_); | 747 source_frame_number_); |
752 } | 748 } |
(...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1567 scoped_ptr<PendingPageScaleAnimation> pending_animation) { | 1563 scoped_ptr<PendingPageScaleAnimation> pending_animation) { |
1568 pending_page_scale_animation_ = pending_animation.Pass(); | 1564 pending_page_scale_animation_ = pending_animation.Pass(); |
1569 } | 1565 } |
1570 | 1566 |
1571 scoped_ptr<PendingPageScaleAnimation> | 1567 scoped_ptr<PendingPageScaleAnimation> |
1572 LayerTreeImpl::TakePendingPageScaleAnimation() { | 1568 LayerTreeImpl::TakePendingPageScaleAnimation() { |
1573 return pending_page_scale_animation_.Pass(); | 1569 return pending_page_scale_animation_.Pass(); |
1574 } | 1570 } |
1575 | 1571 |
1576 } // namespace cc | 1572 } // namespace cc |
OLD | NEW |