OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/scheduler/scheduler.h" | 5 #include "cc/scheduler/scheduler.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
622 | 622 |
623 base::AutoReset<bool> mark_inside(&inside_process_scheduled_actions_, true); | 623 base::AutoReset<bool> mark_inside(&inside_process_scheduled_actions_, true); |
624 | 624 |
625 SchedulerStateMachine::Action action; | 625 SchedulerStateMachine::Action action; |
626 do { | 626 do { |
627 action = state_machine_.NextAction(); | 627 action = state_machine_.NextAction(); |
628 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("cc.debug.scheduler"), | 628 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("cc.debug.scheduler"), |
629 "SchedulerStateMachine", | 629 "SchedulerStateMachine", |
630 "state", | 630 "state", |
631 AsValue()); | 631 AsValue()); |
632 state_machine_.UpdateState(action); | 632 state_machine_.WillAction(action); |
633 base::AutoReset<SchedulerStateMachine::Action> | 633 base::AutoReset<SchedulerStateMachine::Action> |
634 mark_inside_action(&inside_action_, action); | 634 mark_inside_action(&inside_action_, action); |
635 switch (action) { | 635 switch (action) { |
636 case SchedulerStateMachine::ACTION_NONE: | 636 case SchedulerStateMachine::ACTION_NONE: |
637 break; | 637 break; |
638 case SchedulerStateMachine::ACTION_ANIMATE: | 638 case SchedulerStateMachine::ACTION_ANIMATE: |
639 client_->ScheduledActionAnimate(); | 639 client_->ScheduledActionAnimate(); |
640 break; | 640 break; |
641 case SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME: | 641 case SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME: |
642 compositor_timing_history_->WillBeginMainFrame(); | 642 compositor_timing_history_->WillBeginMainFrame(); |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
810 } | 810 } |
811 | 811 |
812 bool Scheduler::IsBeginMainFrameSentOrStarted() const { | 812 bool Scheduler::IsBeginMainFrameSentOrStarted() const { |
813 return (state_machine_.begin_main_frame_state() == | 813 return (state_machine_.begin_main_frame_state() == |
814 SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_SENT || | 814 SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_SENT || |
815 state_machine_.begin_main_frame_state() == | 815 state_machine_.begin_main_frame_state() == |
816 SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_STARTED); | 816 SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_STARTED); |
817 } | 817 } |
818 | 818 |
819 } // namespace cc | 819 } // namespace cc |
OLD | NEW |