cc: Do not reset pending tree state incorrectly on aborted commits.

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 5d6f5895f34931adae9d37191f34e75f0e6fa6fd..054034a62d6be5adb23d13f5f1523f94a8f4a60d 100644
--- a/cc/scheduler/scheduler_state_machine.cc
+++ b/cc/scheduler/scheduler_state_machine.cc
@@ -578,6 +578,9 @@ void SchedulerStateMachine::WillSendBeginMainFrame() {
 }
 
 void SchedulerStateMachine::WillCommit(bool commit_has_no_updates) {
+  DCHECK(!has_pending_tree_ ||
+         (settings_.main_frame_before_activation_enabled &&
+          commit_has_no_updates));
   commit_count_++;
 
   if (commit_has_no_updates || settings_.main_frame_before_activation_enabled) {
@@ -587,7 +590,8 @@ void SchedulerStateMachine::WillCommit(bool commit_has_no_updates) {
   }
 
   // If the commit was aborted, then there is no pending tree.

[enne (OOO), 2016/05/16 17:05:41]

I don't think this comment is true any longer.

[sunnyps, 2016/05/16 19:54:22]

Done.

-  has_pending_tree_ = !commit_has_no_updates;
+  if (!commit_has_no_updates)
+    has_pending_tree_ = true;
 
   wait_for_ready_to_draw_ =
       !commit_has_no_updates && settings_.commit_to_active_tree;