cc: Rename SwapBuffers on CompositorFrameSink to SubmitCompositorFrame

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 98 matching lines @@
   }
 
   bool RedrawPending() const { return needs_redraw_; }
   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_SUBMIT_COMPOSITOR_FRAME_IF_POSSIBLE,
+    ACTION_SUBMIT_COMPOSITOR_FRAME_FORCED,
+    ACTION_SUBMIT_COMPOSITOR_FRAME_ABORT,
     ACTION_BEGIN_COMPOSITOR_FRAME_SINK_CREATION,
     ACTION_PREPARE_TILES,
     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 WillBeginCompositorFrameSinkCreation();
   void WillPrepareTiles();
   void WillInvalidateCompositorFrameSink();
 
   void DidDraw(DrawResult draw_result);
 
-  void AbortDrawAndSwap();
+  void AbortSubmitCompositorFrame();
 
   // 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.
   // The scheduler will not draw more than once in a given BeginImplFrame
   // callback nor send more than one BeginMainFrame message.
   void OnBeginImplFrame();
   // Indicates that the scheduler has entered the draw phase. The scheduler
   // will not draw more than once in a single draw phase.
   // TODO(sunnyps): Rename OnBeginImplFrameDeadline to OnDraw or similar.
   void OnBeginImplFrameDeadline();
   void OnBeginImplFrameIdle();
 
   int current_frame_number() const { return current_frame_number_; }
 
   BeginImplFrameState begin_impl_frame_state() const {
     return begin_impl_frame_state_;
   }
   BeginImplFrameDeadlineMode CurrentBeginImplFrameDeadlineMode() const;
 
   // If the main thread didn't manage to produce a new frame in time for the
   // impl thread to draw, it is in a high latency mode.
   bool main_thread_missed_last_deadline() const {
     return main_thread_missed_last_deadline_;
   }
 
-  bool SwapThrottled() const;
+  bool SubmitThrottled() const;

[enne (OOO), 2016/10/11 17:26:00]

bikeshedding: IsSubmitThrottled?

[danakj, 2016/10/13 23:50:22]

Went to IsDrawThrottled.

 
   // Indicates whether the LayerTreeHostImpl is visible.
   void SetVisible(bool visible);
   bool visible() const { return visible_; }
 
   void SetBeginFrameSourcePaused(bool paused);
   bool begin_frame_source_paused() const { return begin_frame_source_paused_; }
 
   // Indicates that a redraw is required, either due to the impl tree changing
   // or the screen being damaged and simply needing redisplay.
   void SetNeedsRedraw();
   bool needs_redraw() const { return needs_redraw_; }
 
   bool OnlyImplSideUpdatesExpected() const;
 
   // Indicates that prepare-tiles is required. This guarantees another
   // PrepareTiles will occur shortly (even if no redraw is required).
   void SetNeedsPrepareTiles();
 
   // 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);

[sunnyps, 2016/10/11 18:32:48]

Can you clarify why this method was removed?

[danakj, 2016/10/13 23:50:22]

The method doesn't exist only the definition does.

+  void DidSubmitCompositorFrame();
 
   // Notification from the CompositorFrameSink that a swap has been consumed.
-  void DidSwapBuffersComplete();
+  void DidReceiveCompositorFrameAck();
 
-  int pending_swaps() const { return pending_swaps_; }
+  int pending_submit_frames() const { return pending_submit_frames_; }
 
   // 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.
   void SetCriticalBeginMainFrameToActivateIsFast(bool is_fast);
 
   // A function of SetTreePrioritiesAndScrollState and
@@ skipping 84 matching lines @@
   const SchedulerSettings settings_;
 
   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_submit_performed_;
   int last_frame_number_draw_performed_;
   int last_frame_number_begin_main_frame_sent_;
   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_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_compositor_frame_sink_;
+  int max_pending_submit_frames_;
+  int pending_submit_frames_;
+  int submit_frames_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_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_;
+  bool did_submit_in_last_frame_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SchedulerStateMachine);
 };
 
 }  // namespace cc
 
 #endif  // CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_