Trigger deadline immediately after an aborted main thread commit

cc/scheduler/scheduler_state_machine.cc

Index: cc/scheduler/scheduler_state_machine.cc
diff --git a/cc/scheduler/scheduler_state_machine.cc b/cc/scheduler/scheduler_state_machine.cc
index 641c80b012510c4162021f89ca68dae99ecec69a..19e413775cd657d6568d9b79422e0f5fab6f7e0e 100644
--- a/cc/scheduler/scheduler_state_machine.cc
+++ b/cc/scheduler/scheduler_state_machine.cc
@@ -880,6 +880,9 @@ bool SchedulerStateMachine::ShouldTriggerBeginFrameDeadlineEarly() const {
   if (readback_state_ != READBACK_STATE_IDLE)
     return false;
 
+  if (commit_state_ == COMMIT_STATE_IDLE && needs_redraw_)

[brianderson, 2013/10/15 10:00:23]

Can you reorganize this method so that it checks the begin_frame_state before
this point to early out and returns false at the end?

In this if statement, can you also add "&& has_pending_tree". At ToT, the
commit_state_ will not be idle when has_pending_tree is true, but that will
change after https://codereview.chromium.org/23907006.

+    return true;
+
   // TODO(brianderson): This should take into account multiple commit sources.
   return begin_frame_state_ == BEGIN_FRAME_STATE_INSIDE_BEGIN_FRAME &&
          active_tree_needs_first_draw_;