Index: cc/scheduler/scheduler_state_machine.cc |
diff --git a/cc/scheduler/scheduler_state_machine.cc b/cc/scheduler/scheduler_state_machine.cc |
index fae4b72b3288fe5c0758f7fee539e73c70acf3d5..5f83b4a1b9d1d7526b74ae0fcc1d264ff8eac2c7 100644 |
--- a/cc/scheduler/scheduler_state_machine.cc |
+++ b/cc/scheduler/scheduler_state_machine.cc |
@@ -48,7 +48,6 @@ SchedulerStateMachine::SchedulerStateMachine(const SchedulerSettings& settings) |
did_create_and_initialize_first_output_surface_(false), |
impl_latency_takes_priority_(false), |
skip_next_begin_main_frame_to_reduce_latency_(false), |
- skip_begin_main_frame_to_reduce_latency_(false), |
continuous_painting_(false), |
children_need_begin_frames_(false), |
defer_commits_(false), |
@@ -238,8 +237,6 @@ void SchedulerStateMachine::AsValueInto( |
impl_latency_takes_priority_); |
state->SetBoolean("main_thread_is_in_high_latency_mode", |
MainThreadIsInHighLatencyMode()); |
- state->SetBoolean("skip_begin_main_frame_to_reduce_latency", |
- skip_begin_main_frame_to_reduce_latency_); |
state->SetBoolean("skip_next_begin_main_frame_to_reduce_latency", |
skip_next_begin_main_frame_to_reduce_latency_); |
state->SetBoolean("continuous_painting", continuous_painting_); |
@@ -474,7 +471,7 @@ bool SchedulerStateMachine::ShouldSendBeginMainFrame() const { |
return false; |
} |
- if (skip_begin_main_frame_to_reduce_latency_) |
+ if (skip_next_begin_main_frame_to_reduce_latency_) |
return false; |
return true; |
@@ -863,10 +860,6 @@ void SchedulerStateMachine::OnBeginImplFrame() { |
// "Drain" the PrepareTiles funnel. |
if (prepare_tiles_funnel_ > 0) |
prepare_tiles_funnel_--; |
- |
- skip_begin_main_frame_to_reduce_latency_ = |
- skip_next_begin_main_frame_to_reduce_latency_; |
- skip_next_begin_main_frame_to_reduce_latency_ = false; |
} |
void SchedulerStateMachine::OnBeginImplFrameDeadlinePending() { |
@@ -884,6 +877,8 @@ void SchedulerStateMachine::OnBeginImplFrameDeadline() { |
void SchedulerStateMachine::OnBeginImplFrameIdle() { |
begin_impl_frame_state_ = BEGIN_IMPL_FRAME_STATE_IDLE; |
+ |
+ skip_next_begin_main_frame_to_reduce_latency_ = false; |
} |
SchedulerStateMachine::BeginImplFrameDeadlineMode |
@@ -912,7 +907,6 @@ SchedulerStateMachine::CurrentBeginImplFrameDeadlineMode() const { |
bool SchedulerStateMachine::ShouldTriggerBeginImplFrameDeadlineImmediately() |
const { |
- // TODO(brianderson): This should take into account multiple commit sources. |
if (begin_impl_frame_state_ != BEGIN_IMPL_FRAME_STATE_INSIDE_BEGIN_FRAME) |
return false; |