| Index: cc/scheduler/scheduler.cc
|
| diff --git a/cc/scheduler/scheduler.cc b/cc/scheduler/scheduler.cc
|
| index 3e8833fc15eb2a5529f017a1aa2632732f44a053..e383894a7836f9164ceb6cb14e647ce929837622 100644
|
| --- a/cc/scheduler/scheduler.cc
|
| +++ b/cc/scheduler/scheduler.cc
|
| @@ -44,8 +44,8 @@ void Scheduler::SetCanDraw(bool can_draw) {
|
| ProcessScheduledActions();
|
| }
|
|
|
| -void Scheduler::SetHasPendingTree(bool has_pending_tree) {
|
| - state_machine_.SetHasPendingTree(has_pending_tree);
|
| +void Scheduler::NotifyReadyToActivate() {
|
| + state_machine_.NotifyReadyToActivate();
|
| ProcessScheduledActions();
|
| }
|
|
|
| @@ -220,8 +220,8 @@ void Scheduler::ProcessScheduledActions() {
|
| case SchedulerStateMachine::ACTION_UPDATE_VISIBLE_TILES:
|
| client_->ScheduledActionUpdateVisibleTiles();
|
| break;
|
| - case SchedulerStateMachine::ACTION_ACTIVATE_PENDING_TREE_IF_NEEDED:
|
| - client_->ScheduledActionActivatePendingTreeIfNeeded();
|
| + case SchedulerStateMachine::ACTION_ACTIVATE_PENDING_TREE:
|
| + client_->ScheduledActionActivatePendingTree();
|
| break;
|
| case SchedulerStateMachine::ACTION_DRAW_IF_POSSIBLE:
|
| DrawAndSwapIfPossible();
|
|
|