Index: cc/scheduler/scheduler_state_machine.cc |
diff --git a/cc/scheduler/scheduler_state_machine.cc b/cc/scheduler/scheduler_state_machine.cc |
index 704259beafd6ea9f86ea2d44c5fdc812236225d7..ea5c2faea1451bf6a3706ce35a187fe1dd99f4e4 100644 |
--- a/cc/scheduler/scheduler_state_machine.cc |
+++ b/cc/scheduler/scheduler_state_machine.cc |
@@ -454,15 +454,9 @@ void SchedulerStateMachine::UpdateState(Action action) { |
} |
case ACTION_DRAW_FORCED: |
- case ACTION_DRAW_IF_POSSIBLE: { |
- bool did_swap = true; |
- UpdateStateOnDraw(did_swap); |
- return; |
- } |
- |
+ case ACTION_DRAW_IF_POSSIBLE: |
case ACTION_DRAW_AND_SWAP_ABORT: { |
- bool did_swap = false; |
- UpdateStateOnDraw(did_swap); |
+ UpdateStateOnDraw(); |
return; |
} |
@@ -542,7 +536,7 @@ void SchedulerStateMachine::UpdateStateOnActivation() { |
needs_redraw_ = true; |
} |
-void SchedulerStateMachine::UpdateStateOnDraw(bool did_swap) { |
+void SchedulerStateMachine::UpdateStateOnDraw() { |
if (inside_begin_frame_) |
last_frame_number_where_draw_was_called_ = current_frame_number_; |
if (commit_state_ == COMMIT_STATE_WAITING_FOR_FIRST_FORCED_DRAW) { |
@@ -559,9 +553,6 @@ void SchedulerStateMachine::UpdateStateOnDraw(bool did_swap) { |
needs_forced_redraw_ = false; |
draw_if_possible_failed_ = false; |
active_tree_has_been_drawn_ = true; |
- |
- if (did_swap) |
- swap_used_incomplete_tile_ = false; |
} |
void SchedulerStateMachine::SetMainThreadNeedsLayerTextures() { |
@@ -614,8 +605,9 @@ void SchedulerStateMachine::SetVisible(bool visible) { visible_ = visible; } |
void SchedulerStateMachine::SetNeedsRedraw() { needs_redraw_ = true; } |
-void SchedulerStateMachine::DidSwapUseIncompleteTile() { |
- swap_used_incomplete_tile_ = true; |
+void SchedulerStateMachine::SetSwapUsedIncompleteTile( |
+ bool used_incomplete_tile) { |
+ swap_used_incomplete_tile_ = used_incomplete_tile; |
} |
void SchedulerStateMachine::SetNeedsForcedRedraw() { |