| Index: cc/scheduler/scheduler_state_machine.h
|
| diff --git a/cc/scheduler/scheduler_state_machine.h b/cc/scheduler/scheduler_state_machine.h
|
| index e54bcb7ed86015a41dc2e7e296064665e0f99ff1..d1c899ef3757cc3e825673d6f93cabc927ccc2eb 100644
|
| --- a/cc/scheduler/scheduler_state_machine.h
|
| +++ b/cc/scheduler/scheduler_state_machine.h
|
| @@ -68,13 +68,6 @@ class CC_EXPORT SchedulerStateMachine {
|
| };
|
| static const char* CommitStateToString(CommitState state);
|
|
|
| - enum TextureState {
|
| - LAYER_TEXTURE_STATE_UNLOCKED,
|
| - LAYER_TEXTURE_STATE_ACQUIRED_BY_MAIN_THREAD,
|
| - LAYER_TEXTURE_STATE_ACQUIRED_BY_IMPL_THREAD,
|
| - };
|
| - static const char* TextureStateToString(TextureState state);
|
| -
|
| enum SynchronousReadbackState {
|
| READBACK_STATE_IDLE,
|
| READBACK_STATE_NEEDS_BEGIN_MAIN_FRAME,
|
| @@ -117,7 +110,6 @@ class CC_EXPORT SchedulerStateMachine {
|
| ACTION_DRAW_AND_SWAP_ABORT,
|
| ACTION_DRAW_AND_READBACK,
|
| ACTION_BEGIN_OUTPUT_SURFACE_CREATION,
|
| - ACTION_ACQUIRE_LAYER_TEXTURES_FOR_MAIN_THREAD,
|
| ACTION_MANAGE_TILES,
|
| };
|
| static const char* ActionToString(Action action);
|
| @@ -214,8 +206,6 @@ class CC_EXPORT SchedulerStateMachine {
|
| // ACTION_DRAW_AND_SWAP_IF_POSSIBLE will not draw until the main thread
|
| // releases the
|
| // textures to the impl thread by committing the layers.
|
| - void SetMainThreadNeedsLayerTextures();
|
| -
|
| // Set that we can create the first OutputSurface and start the scheduler.
|
| void SetCanStart() { can_start_ = true; }
|
|
|
| @@ -262,7 +252,6 @@ class CC_EXPORT SchedulerStateMachine {
|
| bool ShouldDrawForced() const;
|
| bool ShouldDraw() const;
|
| bool ShouldActivatePendingTree() const;
|
| - bool ShouldAcquireLayerTexturesForMainThread() const;
|
| bool ShouldUpdateVisibleTiles() const;
|
| bool ShouldSendBeginMainFrame() const;
|
| bool ShouldCommit() const;
|
| @@ -284,7 +273,6 @@ class CC_EXPORT SchedulerStateMachine {
|
| OutputSurfaceState output_surface_state_;
|
| BeginImplFrameState begin_impl_frame_state_;
|
| CommitState commit_state_;
|
| - TextureState texture_state_;
|
| ForcedRedrawOnTimeoutState forced_redraw_state_;
|
| SynchronousReadbackState readback_state_;
|
|
|
| @@ -306,7 +294,6 @@ class CC_EXPORT SchedulerStateMachine {
|
| bool needs_manage_tiles_;
|
| bool swap_used_incomplete_tile_;
|
| bool needs_commit_;
|
| - bool main_thread_needs_layer_textures_;
|
| bool inside_poll_for_anticipated_draw_triggers_;
|
| bool visible_;
|
| bool can_start_;
|
|
|