Trigger deadline immediately after an aborted main thread commit

cc/scheduler/scheduler_state_machine.cc

 // 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.
 
 #include "cc/scheduler/scheduler_state_machine.h"
 
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
@@ skipping 862 matching lines @@
       << *AsValue();
   begin_frame_state_ = BEGIN_FRAME_STATE_IDLE;
 }
 
 bool SchedulerStateMachine::ShouldTriggerBeginFrameDeadlineEarly() const {
   // If we are in the middle of the readback, we won't swap, so there is
   // no reason to trigger the deadline early.
   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_;
 }
 
 void SchedulerStateMachine::DidEnterPollForAnticipatedDrawTriggers() {
   current_frame_number_++;
   inside_poll_for_anticipated_draw_triggers_ = true;
 }
 
@@ skipping 110 matching lines @@
     case OUTPUT_SURFACE_ACTIVE:
     case OUTPUT_SURFACE_WAITING_FOR_FIRST_COMMIT:
     case OUTPUT_SURFACE_WAITING_FOR_FIRST_ACTIVATION:
       return true;
   }
   NOTREACHED();
   return false;
 }
 
 }  // namespace cc