Fork cc::OutputSurface into cc::CompositorFrameSink.

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 <memory>
 #include <string>
 
@@ skipping 30 matching lines @@
 // requested, while external state includes things like the current time being
 // near to the vblank time.
 //
 // The scheduler seperates "what to do next" from the updating of its internal
 // state to make testing cleaner.
 class CC_EXPORT SchedulerStateMachine {
  public:
   // settings must be valid for the lifetime of this class.
   explicit SchedulerStateMachine(const SchedulerSettings& settings);
 
-  enum OutputSurfaceState {
-    OUTPUT_SURFACE_NONE,
-    OUTPUT_SURFACE_ACTIVE,
-    OUTPUT_SURFACE_CREATING,
-    OUTPUT_SURFACE_WAITING_FOR_FIRST_COMMIT,
-    OUTPUT_SURFACE_WAITING_FOR_FIRST_ACTIVATION,
+  enum CompositorFrameSinkState {
+    COMPOSITOR_FRAME_SINK_NONE,
+    COMPOSITOR_FRAME_SINK_ACTIVE,
+    COMPOSITOR_FRAME_SINK_CREATING,
+    COMPOSITOR_FRAME_SINK_WAITING_FOR_FIRST_COMMIT,
+    COMPOSITOR_FRAME_SINK_WAITING_FOR_FIRST_ACTIVATION,
   };
-  static const char* OutputSurfaceStateToString(OutputSurfaceState state);
+  static const char* CompositorFrameSinkStateToString(
+      CompositorFrameSinkState state);
 
   // Note: BeginImplFrameState does not cycle through these states in a fixed
   // order on all platforms. It's up to the scheduler to set these correctly.
   enum BeginImplFrameState {
     BEGIN_IMPL_FRAME_STATE_IDLE,
     BEGIN_IMPL_FRAME_STATE_INSIDE_BEGIN_FRAME,
     BEGIN_IMPL_FRAME_STATE_INSIDE_DEADLINE,
   };
   static const char* BeginImplFrameStateToString(BeginImplFrameState state);
 
@@ skipping 44 matching lines @@
   bool PrepareTilesPending() const { return needs_prepare_tiles_; }
 
   enum Action {
     ACTION_NONE,
     ACTION_SEND_BEGIN_MAIN_FRAME,
     ACTION_COMMIT,
     ACTION_ACTIVATE_SYNC_TREE,
     ACTION_DRAW_AND_SWAP_IF_POSSIBLE,
     ACTION_DRAW_AND_SWAP_FORCED,
     ACTION_DRAW_AND_SWAP_ABORT,
-    ACTION_BEGIN_OUTPUT_SURFACE_CREATION,
+    ACTION_BEGIN_COMPOSITOR_FRAME_SINK_CREATION,
     ACTION_PREPARE_TILES,
-    ACTION_INVALIDATE_OUTPUT_SURFACE,
+    ACTION_INVALIDATE_COMPOSITOR_FRAME_SINK,
   };
   static const char* ActionToString(Action action);
 
   std::unique_ptr<base::trace_event::ConvertableToTraceFormat> AsValue() const;
   void AsValueInto(base::trace_event::TracedValue* dict) const;
 
   Action NextAction() const;
   void WillSendBeginMainFrame();
   void WillCommit(bool commit_had_no_updates);
   void WillActivate();
   void WillDraw();
-  void WillBeginOutputSurfaceCreation();
+  void WillBeginCompositorFrameSinkCreation();
   void WillPrepareTiles();
-  void WillInvalidateOutputSurface();
+  void WillInvalidateCompositorFrameSink();
 
   void DidDraw(DrawResult draw_result);
 
   void AbortDrawAndSwap();
 
   // Indicates whether the impl thread needs a BeginImplFrame callback in order
   // to make progress.
   bool BeginFrameNeeded() const;
 
   // Indicates that the system has entered and left a BeginImplFrame callback.
@@ skipping 38 matching lines @@
 
   // If the scheduler attempted to draw and swap, this provides feedback
   // regarding whether or not the swap actually occured. We might skip the
   // swap when there is not damage, for example.
   void DidSwapBuffers();
 
   // Indicates whether a redraw is required because we are currently rendering
   // with a low resolution or checkerboarded tile.
   void SetSwapUsedIncompleteTile(bool used_incomplete_tile);
 
-  // Notification from the OutputSurface that a swap has been consumed.
+  // Notification from the CompositorFrameSink that a swap has been consumed.
   void DidSwapBuffersComplete();
 
   int pending_swaps() const { return pending_swaps_; }
 
   // Indicates whether to prioritize impl thread latency (i.e., animation
   // smoothness) over new content activation.
   void SetTreePrioritiesAndScrollState(TreePriority tree_priority,
                                        ScrollHandlerState scroll_handler_state);
 
   // Indicates if the main thread will likely respond within 1 vsync.
@@ skipping 41 matching lines @@
 
   // Indicates the active tree's visible tiles are ready to be drawn.
   void NotifyReadyToDraw();
 
   bool has_pending_tree() const { return has_pending_tree_; }
   bool active_tree_needs_first_draw() const {
     return active_tree_needs_first_draw_;
   }
 
   void DidPrepareTiles();
-  void DidLoseOutputSurface();
-  void DidCreateAndInitializeOutputSurface();
-  bool HasInitializedOutputSurface() const;
+  void DidLoseCompositorFrameSink();
+  void DidCreateAndInitializeCompositorFrameSink();
+  bool HasInitializedCompositorFrameSink() const;
 
   // True if we need to abort draws to make forward progress.
   bool PendingDrawsShouldBeAborted() const;
 
   bool CouldSendBeginMainFrame() const;
 
   void SetDeferCommits(bool defer_commits);
 
   void SetVideoNeedsBeginFrames(bool video_needs_begin_frames);
   bool video_needs_begin_frames() const { return video_needs_begin_frames_; }
 
  protected:
   bool BeginFrameRequiredForAction() const;
   bool BeginFrameNeededForVideo() const;
   bool ProactiveBeginFrameWanted() const;
 
   bool ShouldTriggerBeginImplFrameDeadlineImmediately() const;
 
   // True if we need to force activations to make forward progress.
   // TODO(sunnyps): Rename this to ShouldAbortCurrentFrame or similar.
   bool PendingActivationsShouldBeForced() const;
 
-  bool ShouldBeginOutputSurfaceCreation() const;
+  bool ShouldBeginCompositorFrameSinkCreation() const;
   bool ShouldDraw() const;
   bool ShouldActivatePendingTree() const;
   bool ShouldSendBeginMainFrame() const;
   bool ShouldCommit() const;
   bool ShouldPrepareTiles() const;
-  bool ShouldInvalidateOutputSurface() const;
+  bool ShouldInvalidateCompositorFrameSink() const;
 
   void WillDrawInternal();
   void DidDrawInternal(DrawResult draw_result);
 
   const SchedulerSettings settings_;
 
-  OutputSurfaceState output_surface_state_;
+  CompositorFrameSinkState compositor_frame_sink_state_;
   BeginImplFrameState begin_impl_frame_state_;
   BeginMainFrameState begin_main_frame_state_;
   ForcedRedrawOnTimeoutState forced_redraw_state_;
 
   // These are used for tracing only.
   int commit_count_;
   int current_frame_number_;
   int last_frame_number_swap_performed_;
   int last_frame_number_draw_performed_;
   int last_frame_number_begin_main_frame_sent_;
-  int last_frame_number_invalidate_output_surface_performed_;
+  int last_frame_number_invalidate_compositor_frame_sink_performed_;
 
   // These are used to ensure that an action only happens once per frame,
   // deadline, etc.
   bool draw_funnel_;
   bool send_begin_main_frame_funnel_;
-  bool invalidate_output_surface_funnel_;
+  bool invalidate_compositor_frame_sink_funnel_;
   // 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_PREPARE_TILES such that we average one
   // PrepareTiles per BeginImplFrame.
   int prepare_tiles_funnel_;
 
   int consecutive_checkerboard_animations_;
   int max_pending_swaps_;
   int pending_swaps_;
-  int swaps_with_current_output_surface_;
+  int swaps_with_current_compositor_frame_sink_;
   bool needs_redraw_;
   bool needs_prepare_tiles_;
   bool needs_begin_main_frame_;
   bool needs_one_begin_impl_frame_;
   bool visible_;
   bool begin_frame_source_paused_;
   bool resourceless_draw_;
   bool can_draw_;
   bool has_pending_tree_;
   bool pending_tree_is_ready_for_activation_;
   bool active_tree_needs_first_draw_;
-  bool did_create_and_initialize_first_output_surface_;
+  bool did_create_and_initialize_first_compositor_frame_sink_;
   TreePriority tree_priority_;
   ScrollHandlerState scroll_handler_state_;
   bool critical_begin_main_frame_to_activate_is_fast_;
   bool main_thread_missed_last_deadline_;
   bool skip_next_begin_main_frame_to_reduce_latency_;
   bool defer_commits_;
   bool video_needs_begin_frames_;
   bool last_commit_had_no_updates_;
   bool wait_for_ready_to_draw_;
   bool did_draw_in_last_frame_;
   bool did_swap_in_last_frame_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SchedulerStateMachine);
 };
 
 }  // namespace cc
 
 #endif  // CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_