Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: cc/trees/layer_tree_impl.cc

Issue 60513007: Add SwapPromise support to LayerTreeHost and LayerTreeImpl (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Move DCHECK of NULL SwapPromise into QueueSwapPromise() Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "cc/animation/keyframed_animation_curve.h" 8 #include "cc/animation/keyframed_animation_curve.h"
9 #include "cc/animation/scrollbar_animation_controller.h" 9 #include "cc/animation/scrollbar_animation_controller.h"
10 #include "cc/base/math_util.h" 10 #include "cc/base/math_util.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 // The request queue should have been processed and does not require a push. 115 // The request queue should have been processed and does not require a push.
116 DCHECK_EQ(ui_resource_request_queue_.size(), 0u); 116 DCHECK_EQ(ui_resource_request_queue_.size(), 0u);
117 117
118 if (next_activation_forces_redraw_) { 118 if (next_activation_forces_redraw_) {
119 layer_tree_host_impl_->SetFullRootLayerDamage(); 119 layer_tree_host_impl_->SetFullRootLayerDamage();
120 next_activation_forces_redraw_ = false; 120 next_activation_forces_redraw_ = false;
121 } 121 }
122 122
123 target_tree->SetLatencyInfo(latency_info_); 123 target_tree->SetLatencyInfo(latency_info_);
124 latency_info_.Clear(); 124 latency_info_.Clear();
125
126 target_tree->PassSwapPromises(&swap_promise_list_);
127
125 target_tree->SetPageScaleFactorAndLimits( 128 target_tree->SetPageScaleFactorAndLimits(
126 page_scale_factor(), min_page_scale_factor(), max_page_scale_factor()); 129 page_scale_factor(), min_page_scale_factor(), max_page_scale_factor());
127 target_tree->SetPageScaleDelta( 130 target_tree->SetPageScaleDelta(
128 target_tree->page_scale_delta() / target_tree->sent_page_scale_delta()); 131 target_tree->page_scale_delta() / target_tree->sent_page_scale_delta());
129 target_tree->set_sent_page_scale_delta(1); 132 target_tree->set_sent_page_scale_delta(1);
130 133
131 if (settings().use_pinch_virtual_viewport) { 134 if (settings().use_pinch_virtual_viewport) {
132 target_tree->SetViewportLayersFromIds( 135 target_tree->SetViewportLayersFromIds(
133 page_scale_layer_->id(), 136 page_scale_layer_->id(),
134 inner_viewport_scroll_layer_->id(), 137 inner_viewport_scroll_layer_->id(),
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 } 704 }
702 705
703 const ui::LatencyInfo& LayerTreeImpl::GetLatencyInfo() { 706 const ui::LatencyInfo& LayerTreeImpl::GetLatencyInfo() {
704 return latency_info_; 707 return latency_info_;
705 } 708 }
706 709
707 void LayerTreeImpl::ClearLatencyInfo() { 710 void LayerTreeImpl::ClearLatencyInfo() {
708 latency_info_.Clear(); 711 latency_info_.Clear();
709 } 712 }
710 713
714 void LayerTreeImpl::QueueSwapPromise(scoped_ptr<SwapPromise> swap_promise) {
715 DCHECK(swap_promise.get());
danakj 2013/11/26 17:34:19 nit: no .get() needed for scoped_ptr
Yufeng Shen (Slow to review) 2013/11/26 17:38:26 Done.
716 if (swap_promise_list_.size() > kMaxQueuedSwapPromiseNumber)
717 BreakSwapPromises(SwapPromise::SWAP_PROMISE_LIST_OVERFLOW);
718 swap_promise_list_.push_back(swap_promise.Pass());
719 }
720
721 void LayerTreeImpl::PassSwapPromises(
722 ScopedPtrVector<SwapPromise>* new_swap_promise) {
723 swap_promise_list_.insert_and_take(swap_promise_list_.end(),
724 *new_swap_promise);
725 new_swap_promise->clear();
726 }
727
728 void LayerTreeImpl::FinishSwapPromises() {
729 for (size_t i = 0; i < swap_promise_list_.size(); i++)
730 swap_promise_list_[i]->DidSwap();
731 swap_promise_list_.clear();
732 }
733
734 void LayerTreeImpl::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) {
735 for (size_t i = 0; i < swap_promise_list_.size(); i++)
736 swap_promise_list_[i]->DidNotSwap(reason);
737 swap_promise_list_.clear();
738 }
739
711 void LayerTreeImpl::DidModifyTilePriorities() { 740 void LayerTreeImpl::DidModifyTilePriorities() {
712 layer_tree_host_impl_->DidModifyTilePriorities(); 741 layer_tree_host_impl_->DidModifyTilePriorities();
713 } 742 }
714 743
715 void LayerTreeImpl::set_ui_resource_request_queue( 744 void LayerTreeImpl::set_ui_resource_request_queue(
716 const UIResourceRequestQueue& queue) { 745 const UIResourceRequestQueue& queue) {
717 ui_resource_request_queue_ = queue; 746 ui_resource_request_queue_ = queue;
718 } 747 }
719 748
720 ResourceProvider::ResourceId LayerTreeImpl::ResourceIdForUIResource( 749 ResourceProvider::ResourceId LayerTreeImpl::ResourceIdForUIResource(
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 const std::vector<LayerImpl*> LayerTreeImpl::LayersWithCopyOutputRequest() 806 const std::vector<LayerImpl*> LayerTreeImpl::LayersWithCopyOutputRequest()
778 const { 807 const {
779 // Only the active tree needs to know about layers with copy requests, as 808 // Only the active tree needs to know about layers with copy requests, as
780 // they are aborted if not serviced during draw. 809 // they are aborted if not serviced during draw.
781 DCHECK(IsActiveTree()); 810 DCHECK(IsActiveTree());
782 811
783 return layers_with_copy_output_request_; 812 return layers_with_copy_output_request_;
784 } 813 }
785 814
786 } // namespace cc 815 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698