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

Unified Diff: cc/trees/proxy_main.cc

Issue 2323423002: cc: Add SwapPromiseManager and SurfaceSequenceGenerator. (Closed)
Patch Set: Created 4 years, 3 months 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 side-by-side diff with in-line comments
Download patch
Index: cc/trees/proxy_main.cc
diff --git a/cc/trees/proxy_main.cc b/cc/trees/proxy_main.cc
index b5032b4c551aaf5bd811ef87cc57a8f1aee989b9..83e130725e40717e2aff82f183e7161d1fefc4d7 100644
--- a/cc/trees/proxy_main.cc
+++ b/cc/trees/proxy_main.cc
@@ -145,7 +145,8 @@ void ProxyMain::BeginMainFrame(
// If the commit finishes, LayerTreeHost will transfer its swap promises to
// LayerTreeImpl. The destructor of ScopedSwapPromiseChecker aborts the
// remaining swap promises.
- ScopedAbortRemainingSwapPromises swap_promise_checker(layer_tree_host_);
+ ScopedAbortRemainingSwapPromises swap_promise_checker(
+ layer_tree_host_->GetSwapPromiseManager());
final_pipeline_stage_ = max_requested_pipeline_stage_;
max_requested_pipeline_stage_ = NO_PIPELINE_STAGE;
@@ -200,7 +201,7 @@ void ProxyMain::BeginMainFrame(
TRACE_EVENT_INSTANT0("cc", "EarlyOut_NoUpdates", TRACE_EVENT_SCOPE_THREAD);
channel_main_->BeginMainFrameAbortedOnImpl(
CommitEarlyOutReason::FINISHED_NO_UPDATES, begin_main_frame_start_time,
- layer_tree_host_->TakeSwapPromises());
+ layer_tree_host_->GetSwapPromiseManager()->TakeSwapPromises());
// Although the commit is internally aborted, this is because it has been
// detected to be a no-op. From the perspective of an embedder, this commit

Powered by Google App Engine
This is Rietveld 408576698