| Index: cc/scheduler/scheduler.cc
|
| diff --git a/cc/scheduler/scheduler.cc b/cc/scheduler/scheduler.cc
|
| index edf5e2549d54d0554995c6352db047a1018c27e9..73bde11c2fb4b45c0110273a0b544a49ffe1d830 100644
|
| --- a/cc/scheduler/scheduler.cc
|
| +++ b/cc/scheduler/scheduler.cc
|
| @@ -85,9 +85,9 @@ void Scheduler::FinishCommit() {
|
| ProcessScheduledActions();
|
| }
|
|
|
| -void Scheduler::BeginFrameAbortedByMainThread() {
|
| +void Scheduler::BeginFrameAbortedByMainThread(bool cancel_commit) {
|
| TRACE_EVENT0("cc", "Scheduler::BeginFrameAbortedByMainThread");
|
| - state_machine_.BeginFrameAbortedByMainThread();
|
| + state_machine_.BeginFrameAbortedByMainThread(cancel_commit);
|
| ProcessScheduledActions();
|
| }
|
|
|
|
|