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 108 matching lines @@
   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(bool did_request_swap, DrawResult draw_result);
+
   // 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 47 matching lines @@
 
   int pending_swaps() const { return pending_swaps_; }
 
   // Indicates whether to prioritize impl thread latency (i.e., animation
   // smoothness) over new content activation.
   void SetImplLatencyTakesPriority(bool impl_latency_takes_priority);
   bool impl_latency_takes_priority() const {
     return impl_latency_takes_priority_;
   }
 
-  // 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 130 matching lines @@
   bool did_request_swap_in_last_frame_;
   bool did_perform_swap_in_last_draw_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SchedulerStateMachine);
 };
 
 }  // namespace cc
 
 #endif  // CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_