Trigger deadline immediately after an aborted main thread commit

cc/scheduler/scheduler.cc

Index: cc/scheduler/scheduler.cc
diff --git a/cc/scheduler/scheduler.cc b/cc/scheduler/scheduler.cc
index cc2325711107299339a39ccd190d0f6cf55cf154..3240028aa27f0f1265081f61c5ca13fcccf5a6cd 100644
--- a/cc/scheduler/scheduler.cc
+++ b/cc/scheduler/scheduler.cc
@@ -49,8 +49,6 @@ void Scheduler::NotifyReadyToActivate() {
 
 void Scheduler::ActivatePendingTree() {
   client_->ScheduledActionActivatePendingTree();
-  if (state_machine_.ShouldTriggerBeginFrameDeadlineEarly())
-    PostBeginFrameDeadline(base::TimeTicks());
 }
 
 void Scheduler::SetNeedsCommit() {
@@ -89,9 +87,6 @@ void Scheduler::FinishCommit() {
   TRACE_EVENT0("cc", "Scheduler::FinishCommit");
   state_machine_.FinishCommit();
   ProcessScheduledActions();
-
-  if (state_machine_.ShouldTriggerBeginFrameDeadlineEarly())
-    PostBeginFrameDeadline(base::TimeTicks());
 }
 
 void Scheduler::BeginFrameAbortedByMainThread(bool did_handle) {
@@ -330,6 +325,9 @@ void Scheduler::ProcessScheduledActions() {
 
   SetupNextBeginFrameIfNeeded();
   client_->DidAnticipatedDrawTimeChange(AnticipatedDrawTime());
+
+  if (state_machine_.ShouldTriggerBeginFrameDeadlineEarly())
+    PostBeginFrameDeadline(base::TimeTicks());
 }
 
 bool Scheduler::WillDrawIfNeeded() const {