Chromium Code Reviews| Index: cc/scheduler/scheduler_state_machine.h |
| diff --git a/cc/scheduler/scheduler_state_machine.h b/cc/scheduler/scheduler_state_machine.h |
| index 6e306942cf1925db5403884f82c559a94cbbeec7..fa853e54ed8ece0ca9c6cb5d283393165e8287f6 100644 |
| --- a/cc/scheduler/scheduler_state_machine.h |
| +++ b/cc/scheduler/scheduler_state_machine.h |
| @@ -97,7 +97,7 @@ class CC_EXPORT SchedulerStateMachine { |
| CommitState commit_state() const { return commit_state_; } |
| bool RedrawPending() const { return needs_redraw_; } |
| - bool ManageTilesPending() const { return needs_manage_tiles_; } |
| + bool PrepareTilesPending() const { return needs_prepare_tiles_; } |
| enum Action { |
| ACTION_NONE, |
| @@ -109,7 +109,7 @@ class CC_EXPORT SchedulerStateMachine { |
| ACTION_DRAW_AND_SWAP_FORCED, |
| ACTION_DRAW_AND_SWAP_ABORT, |
| ACTION_BEGIN_OUTPUT_SURFACE_CREATION, |
| - ACTION_MANAGE_TILES, |
| + ACTION_PREPARE_TILES, |
| }; |
| static const char* ActionToString(Action action); |
| @@ -166,8 +166,8 @@ class CC_EXPORT SchedulerStateMachine { |
| bool needs_animate() const { return needs_animate_; } |
| // Indicates that manage-tiles is required. This guarantees another |
|
brianderson
2014/12/09 03:30:07
Fix comment
vmiura
2014/12/09 18:08:46
Done.
|
| - // ManageTiles will occur shortly (even if no redraw is required). |
| - void SetNeedsManageTiles(); |
| + // PrepareTiles will occur shortly (even if no redraw is required). |
| + void SetNeedsPrepareTiles(); |
| // Sets how many swaps can be pending to the OutputSurface. |
| void SetMaxSwapsPending(int max); |
| @@ -230,7 +230,7 @@ class CC_EXPORT SchedulerStateMachine { |
| return active_tree_needs_first_draw_; |
| } |
| - void DidManageTiles(); |
| + void DidPrepareTiles(); |
| void DidLoseOutputSurface(); |
| void DidCreateAndInitializeOutputSurface(); |
| bool HasInitializedOutputSurface() const; |
| @@ -278,7 +278,7 @@ class CC_EXPORT SchedulerStateMachine { |
| bool ShouldActivatePendingTree() const; |
| bool ShouldSendBeginMainFrame() const; |
| bool ShouldCommit() const; |
| - bool ShouldManageTiles() const; |
| + bool ShouldPrepareTiles() const; |
| void AdvanceCurrentFrameNumber(); |
| bool HasAnimatedThisFrame() const; |
| @@ -289,7 +289,7 @@ class CC_EXPORT SchedulerStateMachine { |
| void UpdateStateOnCommit(bool commit_was_aborted); |
| void UpdateStateOnActivation(); |
| void UpdateStateOnDraw(bool did_request_swap); |
| - void UpdateStateOnManageTiles(); |
| + void UpdateStateOnPrepareTiles(); |
| const SchedulerSettings settings_; |
| @@ -307,17 +307,17 @@ class CC_EXPORT SchedulerStateMachine { |
| int last_frame_number_swap_requested_; |
| int last_frame_number_begin_main_frame_sent_; |
| - // manage_tiles_funnel_ is "filled" each time ManageTiles is called |
| + // prepare_tiles_funnel_ is "filled" each time PrepareTiles is called |
| // and "drained" on each BeginImplFrame. If the funnel gets too full, |
| - // we start throttling ACTION_MANAGE_TILES such that we average one |
| + // we start throttling ACTION_PREPARE_TILES such that we average one |
| // ManageTile per BeginImplFrame. |
|
brianderson
2014/12/09 03:30:07
ManageTile per BeginImplFrame -> PrepareTile per..
vmiura
2014/12/09 18:08:46
Done.
|
| - int manage_tiles_funnel_; |
| + int prepare_tiles_funnel_; |
| int consecutive_checkerboard_animations_; |
| int max_pending_swaps_; |
| int pending_swaps_; |
| bool needs_redraw_; |
| bool needs_animate_; |
| - bool needs_manage_tiles_; |
| + bool needs_prepare_tiles_; |
| bool needs_commit_; |
| bool inside_poll_for_anticipated_draw_triggers_; |
| bool visible_; |