cc: Use BeginFrameArgs

cc/scheduler/scheduler_state_machine.h

Index: cc/scheduler/scheduler_state_machine.h
diff --git a/cc/scheduler/scheduler_state_machine.h b/cc/scheduler/scheduler_state_machine.h
index 4709aa3c6f380acc7011c60570df3fd274c2d7b1..5d8512becf5e2c172a5ceb6bb69366fdb8fbfa96 100644
--- a/cc/scheduler/scheduler_state_machine.h
+++ b/cc/scheduler/scheduler_state_machine.h
@@ -31,6 +31,13 @@ class CC_EXPORT SchedulerStateMachine {
   // settings must be valid for the lifetime of this class.
   explicit SchedulerStateMachine(const SchedulerSettings& settings);
 
+  enum BeginFrameState {
+    BEGIN_FRAME_IDLE,
+    BEGIN_FRAME_STARTING,
+    BEGIN_FRAME_WAITING,
+    BEGIN_FRAME_DRAWING,
+  };
+
   enum CommitState {
     COMMIT_STATE_IDLE,
     COMMIT_STATE_FRAME_IN_PROGRESS,
@@ -79,9 +86,9 @@ class CC_EXPORT SchedulerStateMachine {
   // Indicates that the system has entered and left a BeginFrame callback.
   // The scheduler will not draw more than once in a given BeginFrame
   // callback.
-  void DidEnterBeginFrame(BeginFrameArgs args);
-  void DidLeaveBeginFrame();
-  bool inside_begin_frame() const { return inside_begin_frame_; }
+  void StartBeginFrame(BeginFrameArgs args);

[Sami, 2013/06/14 15:59:20]

bikeshed: StartBeginFrame sounds weird :) How about just OnBeginFrame or
DidBeginFrame?

[brianderson, 2013/06/14 18:42:36]

OnBeginFrame sounds good.

+  void OnBeginFrameDeadline();
+  BeginFrameState begin_frame_state() const { return begin_frame_state_; }
 
   // Indicates whether the LayerTreeHostImpl is visible.
   void SetVisible(bool visible);
@@ -174,9 +181,10 @@ class CC_EXPORT SchedulerStateMachine {
   int commit_count_;
 
   int current_frame_number_;
-  int last_frame_number_where_draw_was_called_;
-  int last_frame_number_where_tree_activation_attempted_;
-  int last_frame_number_where_check_for_completed_tile_uploads_called_;
+  int current_frame_attempt_;

[brianderson, 2013/06/14 04:16:29]

current_frame_attempt_ allows us to reset the last_frame_attempt* variables
because we want to check some things multiple times per frame (begin frame
start, pending tree activation, and deadline).

+  int last_frame_attempt_draw_was_called_;
+  int last_frame_attempt_tree_activation_attempted_;
+  int last_frame_attempt_check_for_completed_tile_uploads_called_;
   int consecutive_failed_draws_;
   int maximum_number_of_failed_draws_before_draw_is_forced_;
   bool needs_redraw_;
@@ -187,7 +195,8 @@ class CC_EXPORT SchedulerStateMachine {
   bool needs_forced_commit_;
   bool expect_immediate_begin_frame_for_main_thread_;
   bool main_thread_needs_layer_textures_;
-  bool inside_begin_frame_;
+  BeginFrameState begin_frame_state_;
+  bool active_tree_has_been_drawn_;
   BeginFrameArgs last_begin_frame_args_;
   bool visible_;
   bool can_start_;