cc: Allow the main thread to cancel commits

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 325ac1cd35a264a392ef802fb491fac0932135b6..8037a547e85fbe1ccdab240476591a06a540ba16 100644
--- a/cc/scheduler/scheduler_state_machine.h
+++ b/cc/scheduler/scheduler_state_machine.h
@@ -120,8 +120,9 @@ class CC_EXPORT SchedulerStateMachine {
 
   // Call this only in response to receiving an
   // ACTION_SEND_BEGIN_FRAME_TO_MAIN_THREAD from NextAction if the client
-  // rejects the begin frame message.
-  void BeginFrameAbortedByMainThread();
+  // rejects the begin frame message.  If cancel_commit is false, then
+  // another commit will be retried soon.
+  void BeginFrameAbortedByMainThread(bool cancel_commit);
 
   // Request exclusive access to the textures that back single buffered
   // layers on behalf of the main thread. Upon acquisition,
@@ -175,6 +176,7 @@ class CC_EXPORT SchedulerStateMachine {
   int commit_count_;
 
   int current_frame_number_;
+  int last_frame_number_where_commit_was_aborted_;

[brianderson, 2013/07/13 01:26:42]

Can you change this to be last_frame_number_begin_frame_sent_to_main_thread_
along with associated logic? It'll mesh better with something similar I'm doing
in https://codereview.chromium.org/16871016 =)

[enne (OOO), 2013/07/15 22:23:28]

Done.

   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_;