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