Remove old texture path in TextureLayer

cc/scheduler/scheduler_state_machine.h

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_
 #define CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 50 matching lines @@
   enum CommitState {
     COMMIT_STATE_IDLE,
     COMMIT_STATE_BEGIN_MAIN_FRAME_SENT,
     COMMIT_STATE_BEGIN_MAIN_FRAME_STARTED,
     COMMIT_STATE_READY_TO_COMMIT,
     COMMIT_STATE_WAITING_FOR_ACTIVATION,
     COMMIT_STATE_WAITING_FOR_FIRST_DRAW,
   };
   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,
     READBACK_STATE_WAITING_FOR_COMMIT,
     READBACK_STATE_WAITING_FOR_ACTIVATION,
     READBACK_STATE_WAITING_FOR_DRAW_AND_READBACK,
     READBACK_STATE_WAITING_FOR_REPLACEMENT_COMMIT,
     READBACK_STATE_WAITING_FOR_REPLACEMENT_ACTIVATION,
   };
   static const char* SynchronousReadbackStateToString(
@@ skipping 22 matching lines @@
     ACTION_NONE,
     ACTION_SEND_BEGIN_MAIN_FRAME,
     ACTION_COMMIT,
     ACTION_UPDATE_VISIBLE_TILES,
     ACTION_ACTIVATE_PENDING_TREE,
     ACTION_DRAW_AND_SWAP_IF_POSSIBLE,
     ACTION_DRAW_AND_SWAP_FORCED,
     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);
 
   scoped_ptr<base::Value> AsValue() const;
 
   Action NextAction() const;
   void UpdateState(Action action);
 
   void CheckInvariants();
@@ skipping 71 matching lines @@
   // Call this only in response to receiving an ACTION_SEND_BEGIN_MAIN_FRAME
   // from NextAction.
   // Indicates that all painting is complete.
   void NotifyReadyToCommit();
 
   // Call this only in response to receiving an ACTION_SEND_BEGIN_MAIN_FRAME
   // from NextAction if the client rejects the BeginMainFrame message.
   // If did_handle is false, then another commit will be retried soon.
   void BeginMainFrameAborted(bool did_handle);
 
-  // Request exclusive access to the textures that back single buffered
-  // layers on behalf of the main thread. Upon acquisition,
-  // 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; }
 
   void SetSkipNextBeginMainFrameToReduceLatency();
 
   // Indicates whether drawing would, at this time, make sense.
   // CanDraw can be used to suppress flashes or checkerboarding
   // when such behavior would be undesirable.
   void SetCanDraw(bool can);
 
@@ skipping 26 matching lines @@
   bool BeginImplFrameNeededToDraw() const;
   bool ProactiveBeginImplFrameWanted() const;
 
   // True if we need to force activations to make forward progress.
   bool PendingActivationsShouldBeForced() const;
 
   bool ShouldBeginOutputSurfaceCreation() const;
   bool ShouldDrawForced() const;
   bool ShouldDraw() const;
   bool ShouldActivatePendingTree() const;
-  bool ShouldAcquireLayerTexturesForMainThread() const;
   bool ShouldUpdateVisibleTiles() const;
   bool ShouldSendBeginMainFrame() const;
   bool ShouldCommit() const;
   bool ShouldManageTiles() const;
 
   void AdvanceCurrentFrameNumber();
   bool HasSentBeginMainFrameThisFrame() const;
   bool HasScheduledManageTilesThisFrame() const;
   bool HasUpdatedVisibleTilesThisFrame() const;
   bool HasSwappedThisFrame() const;
 
   void UpdateStateOnCommit(bool commit_was_aborted);
   void UpdateStateOnActivation();
   void UpdateStateOnDraw(bool did_swap);
   void UpdateStateOnManageTiles();
 
   const SchedulerSettings settings_;
 
   OutputSurfaceState output_surface_state_;
   BeginImplFrameState begin_impl_frame_state_;
   CommitState commit_state_;
-  TextureState texture_state_;
   ForcedRedrawOnTimeoutState forced_redraw_state_;
   SynchronousReadbackState readback_state_;
 
   BeginFrameArgs last_begin_impl_frame_args_;
 
   int commit_count_;
   int current_frame_number_;
   int last_frame_number_swap_performed_;
   int last_frame_number_begin_main_frame_sent_;
   int last_frame_number_update_visible_tiles_was_called_;
 
   // manage_tiles_funnel_ is "filled" each time ManageTiles is called
   // and "drained" on each BeginImplFrame. If the funnel gets too full,
   // we start throttling ACTION_MANAGE_TILES such that we average one
   // ManageTile per BeginImplFrame.
   int manage_tiles_funnel_;
   int consecutive_checkerboard_animations_;
   bool needs_redraw_;
   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_;
   bool can_draw_;
   bool has_pending_tree_;
   bool pending_tree_is_ready_for_activation_;
   bool active_tree_needs_first_draw_;
   bool draw_if_possible_failed_;
   bool did_create_and_initialize_first_output_surface_;
   bool smoothness_takes_priority_;
   bool skip_next_begin_main_frame_to_reduce_latency_;
   bool skip_begin_main_frame_to_reduce_latency_;
   bool continuous_painting_;
   bool needs_back_to_back_readback_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SchedulerStateMachine);
 };
 
 }  // namespace cc
 
 #endif  // CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_