| Index: cc/trees/thread_proxy.cc
|
| diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
|
| index bd1d235756e8ae2d060439c089fcf16970b77c79..dbf587feb09221af3a03b8dc51581d69df060d7f 100644
|
| --- a/cc/trees/thread_proxy.cc
|
| +++ b/cc/trees/thread_proxy.cc
|
| @@ -17,7 +17,7 @@
|
| #include "cc/input/input_handler.h"
|
| #include "cc/output/context_provider.h"
|
| #include "cc/output/output_surface.h"
|
| -#include "cc/output/swap_promise.h"
|
| +#include "cc/output/promise.h"
|
| #include "cc/quads/draw_quad.h"
|
| #include "cc/resources/prioritized_resource_manager.h"
|
| #include "cc/scheduler/commit_earlyout_reason.h"
|
| @@ -857,7 +857,8 @@ void ThreadProxy::BeginMainFrame(
|
| // went through, and input should no longer be throttled, etc.
|
| layer_tree_host()->CommitComplete();
|
| layer_tree_host()->DidBeginMainFrame();
|
| - layer_tree_host()->BreakSwapPromises(SwapPromise::COMMIT_NO_UPDATE);
|
| + layer_tree_host()->BreakSwapPromises(Promise::DidNotSwap::COMMIT_NO_UPDATE);
|
| + layer_tree_host()->BreakActivationPromises(Promise::DidNotActivate::COMMIT_NO_UPDATE);
|
| return;
|
| }
|
|
|
|
|