cc: Add SchedulerStateMachine::DidDraw and use for forced draws

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 80 matching lines @@
 
   enum ForcedRedrawOnTimeoutState {
     FORCED_REDRAW_STATE_IDLE,
     FORCED_REDRAW_STATE_WAITING_FOR_COMMIT,
     FORCED_REDRAW_STATE_WAITING_FOR_ACTIVATION,
     FORCED_REDRAW_STATE_WAITING_FOR_DRAW,
   };
   static const char* ForcedRedrawOnTimeoutStateToString(
       ForcedRedrawOnTimeoutState state);
 
+  BeginMainFrameState begin_main_frame_state() const {
+    return begin_main_frame_state_;
+  }
+
   bool CommitPending() const {
     return begin_main_frame_state_ == BEGIN_MAIN_FRAME_STATE_SENT ||
            begin_main_frame_state_ == BEGIN_MAIN_FRAME_STATE_STARTED ||
            begin_main_frame_state_ == BEGIN_MAIN_FRAME_STATE_READY_TO_COMMIT;
   }
-  BeginMainFrameState begin_main_frame_state() const {
-    return begin_main_frame_state_;
+
+  bool NewActiveTreeLikely() const {
+    return needs_begin_main_frame_ || CommitPending() || has_pending_tree_;
   }
 
   bool RedrawPending() const { return needs_redraw_; }
   bool PrepareTilesPending() const { return needs_prepare_tiles_; }
 
   enum Action {
     ACTION_NONE,
     ACTION_ANIMATE,
     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_PREPARE_TILES,
     ACTION_INVALIDATE_OUTPUT_SURFACE,
   };
   static const char* ActionToString(Action action);
 
   scoped_refptr<base::trace_event::ConvertableToTraceFormat> AsValue() const;
   void AsValueInto(base::trace_event::TracedValue* dict) const;
 
   Action NextAction() const;
   void WillAnimate();
   void WillSendBeginMainFrame();
   void WillCommit(bool commit_had_no_updates);
   void WillActivate();
-  void WillDraw(bool did_request_swap);
+  void WillDraw();
   void WillBeginOutputSurfaceCreation();
   void WillPrepareTiles();
   void WillInvalidateOutputSurface();
 
+  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.
   // The scheduler will not draw more than once in a given BeginImplFrame
   // callback nor send more than one BeginMainFrame message.
   void OnBeginImplFrame();
   void OnBeginImplFrameDeadlinePending();
   // Indicates that the scheduler has entered the draw phase. The scheduler
@@ skipping 49 matching lines @@
   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
   // SetCriticalBeginMainFrameToActivateIsFast.
   bool ImplLatencyTakesPriority() const;
 
-  // Indicates whether ACTION_DRAW_AND_SWAP_IF_POSSIBLE drew to the screen.
-  void DidDrawIfPossibleCompleted(DrawResult result);
-
   // Indicates that a new begin main frame flow needs to be performed, either
   // to pull updates from the main thread to the impl, or to push deltas from
   // the impl thread to main.
   void SetNeedsBeginMainFrame();
   bool needs_begin_main_frame() const { return needs_begin_main_frame_; }
 
   // Requests a single impl frame (after the current frame if there is one
   // active).
   void SetNeedsOneBeginImplFrame();
 
@@ skipping 68 matching lines @@
 
   bool ShouldAnimate() const;
   bool ShouldBeginOutputSurfaceCreation() const;
   bool ShouldDraw() const;
   bool ShouldActivatePendingTree() const;
   bool ShouldSendBeginMainFrame() const;
   bool ShouldCommit() const;
   bool ShouldPrepareTiles() const;
   bool ShouldInvalidateOutputSurface() const;
 
+  void WillDrawInternal();
+  void DidDrawInternal(DrawResult draw_result);
+
   const SchedulerSettings settings_;
 
   OutputSurfaceState output_surface_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_animate_performed_;
   int last_frame_number_swap_performed_;
-  int last_frame_number_swap_requested_;
+  int last_frame_number_draw_performed_;
   int last_frame_number_begin_main_frame_sent_;
   int last_frame_number_invalidate_output_surface_performed_;
 
   // These are used to ensure that an action only happens once per frame,
   // deadline, etc.
   bool animate_funnel_;
-  bool request_swap_funnel_;
+  bool draw_funnel_;
   bool send_begin_main_frame_funnel_;
   bool invalidate_output_surface_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_;
@@ skipping 14 matching lines @@
   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 children_need_begin_frames_;
   bool defer_commits_;
   bool video_needs_begin_frames_;
   bool last_commit_had_no_updates_;
   bool wait_for_ready_to_draw_;
-  bool did_request_swap_in_last_frame_;
-  bool did_perform_swap_in_last_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_