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

Unified Diff: cc/trees/single_thread_proxy.cc

Issue 2323423002: cc: Add SwapPromiseManager and SurfaceSequenceGenerator. (Closed)
Patch Set: rebase 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/single_thread_proxy.cc
diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
index 886d59b770b536df8acf5ccb9892d98cfb2b0d6f..dbc1fdce1db9197981352116afdc928df96c19a6 100644
--- a/cc/trees/single_thread_proxy.cc
+++ b/cc/trees/single_thread_proxy.cc
@@ -493,7 +493,9 @@ void SingleThreadProxy::CompositeImmediately(base::TimeTicks frame_begin_time) {
DoBeginMainFrame(begin_frame_args);
DoCommit();
- DCHECK_EQ(0u, layer_tree_host_->num_queued_swap_promises())
+ DCHECK_EQ(
+ 0u,
+ layer_tree_host_->GetSwapPromiseManager()->num_queued_swap_promises())
<< "Commit should always succeed and transfer promises.";
}
@@ -655,7 +657,8 @@ void SingleThreadProxy::BeginMainFrame(const BeginFrameArgs& begin_frame_args) {
// This checker assumes NotifyReadyToCommit in this stack causes a synchronous
// commit.
- ScopedAbortRemainingSwapPromises swap_promise_checker(layer_tree_host_);
+ ScopedAbortRemainingSwapPromises swap_promise_checker(
+ layer_tree_host_->GetSwapPromiseManager());
if (!layer_tree_host_->IsVisible()) {
TRACE_EVENT_INSTANT0("cc", "EarlyOut_NotVisible", TRACE_EVENT_SCOPE_THREAD);

Powered by Google App Engine
This is Rietveld 408576698