| Index: cc/scheduler/scheduler_state_machine.cc
|
| diff --git a/cc/scheduler/scheduler_state_machine.cc b/cc/scheduler/scheduler_state_machine.cc
|
| index 35e73f696961f5a04d11f72962a04434aec89bcf..bcd1ff49b6c6010425807c84ff67a9169fd3509c 100644
|
| --- a/cc/scheduler/scheduler_state_machine.cc
|
| +++ b/cc/scheduler/scheduler_state_machine.cc
|
| @@ -86,8 +86,6 @@ const char* SchedulerStateMachine::BeginImplFrameStateToString(
|
| switch (state) {
|
| case BEGIN_IMPL_FRAME_STATE_IDLE:
|
| return "BEGIN_IMPL_FRAME_STATE_IDLE";
|
| - case BEGIN_IMPL_FRAME_STATE_BEGIN_FRAME_STARTING:
|
| - return "BEGIN_IMPL_FRAME_STATE_BEGIN_FRAME_STARTING";
|
| case BEGIN_IMPL_FRAME_STATE_INSIDE_BEGIN_FRAME:
|
| return "BEGIN_IMPL_FRAME_STATE_INSIDE_BEGIN_FRAME";
|
| case BEGIN_IMPL_FRAME_STATE_INSIDE_DEADLINE:
|
| @@ -536,8 +534,8 @@ bool SchedulerStateMachine::ShouldInvalidateOutputSurface() const {
|
| if (!settings_.using_synchronous_renderer_compositor)
|
| return false;
|
|
|
| - // Invalidations are only performed inside a BeginFrame.
|
| - if (begin_impl_frame_state_ != BEGIN_IMPL_FRAME_STATE_BEGIN_FRAME_STARTING)
|
| + // Invalidate only within a BeginFrame.
|
| + if (begin_impl_frame_state_ != BEGIN_IMPL_FRAME_STATE_INSIDE_BEGIN_FRAME)
|
| return false;
|
|
|
| // TODO(sunnyps): needs_prepare_tiles_ is needed here because PrepareTiles is
|
| @@ -860,7 +858,7 @@ bool SchedulerStateMachine::ProactiveBeginFrameWanted() const {
|
| }
|
|
|
| void SchedulerStateMachine::OnBeginImplFrame() {
|
| - begin_impl_frame_state_ = BEGIN_IMPL_FRAME_STATE_BEGIN_FRAME_STARTING;
|
| + begin_impl_frame_state_ = BEGIN_IMPL_FRAME_STATE_INSIDE_BEGIN_FRAME;
|
| current_frame_number_++;
|
|
|
| last_commit_had_no_updates_ = false;
|
| @@ -877,10 +875,6 @@ void SchedulerStateMachine::OnBeginImplFrame() {
|
| prepare_tiles_funnel_--;
|
| }
|
|
|
| -void SchedulerStateMachine::OnBeginImplFrameDeadlinePending() {
|
| - begin_impl_frame_state_ = BEGIN_IMPL_FRAME_STATE_INSIDE_BEGIN_FRAME;
|
| -}
|
| -
|
| void SchedulerStateMachine::OnBeginImplFrameDeadline() {
|
| begin_impl_frame_state_ = BEGIN_IMPL_FRAME_STATE_INSIDE_DEADLINE;
|
|
|
|
|