| Index: cc/trees/single_thread_proxy.cc
|
| diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
|
| index dc46c48e6436415e03eebe234b3b803abdc60608..098b481094ed087996d63e78bc934c9a33cb9b88 100644
|
| --- a/cc/trees/single_thread_proxy.cc
|
| +++ b/cc/trees/single_thread_proxy.cc
|
| @@ -492,7 +492,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.";
|
| }
|
|
|
| @@ -654,7 +656,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);
|
|
|