| Index: cc/trees/proxy_impl.cc
|
| diff --git a/cc/trees/proxy_impl.cc b/cc/trees/proxy_impl.cc
|
| index 8e651144d8e6f231300921f518f19518a53eb50f..4852da2a52e8523e37eff553dce60b8f93e27c05 100644
|
| --- a/cc/trees/proxy_impl.cc
|
| +++ b/cc/trees/proxy_impl.cc
|
| @@ -188,7 +188,8 @@ void ProxyImpl::SetNeedsCommitOnImpl() {
|
|
|
| void ProxyImpl::BeginMainFrameAbortedOnImpl(
|
| CommitEarlyOutReason reason,
|
| - base::TimeTicks main_thread_start_time) {
|
| + base::TimeTicks main_thread_start_time,
|
| + std::vector<std::unique_ptr<SwapPromise>> swap_promises) {
|
| TRACE_EVENT1("cc", "ProxyImpl::BeginMainFrameAbortedOnImplThread", "reason",
|
| CommitEarlyOutReasonToString(reason));
|
| DCHECK(IsImplThread());
|
| @@ -197,7 +198,8 @@ void ProxyImpl::BeginMainFrameAbortedOnImpl(
|
| if (CommitEarlyOutHandledCommit(reason)) {
|
| SetInputThrottledUntilCommitOnImpl(false);
|
| }
|
| - layer_tree_host_impl_->BeginMainFrameAborted(reason);
|
| + layer_tree_host_impl_->BeginMainFrameAborted(reason,
|
| + std::move(swap_promises));
|
| scheduler_->NotifyBeginMainFrameStarted(main_thread_start_time);
|
| scheduler_->BeginMainFrameAborted(reason);
|
| }
|
|
|