cc: Start commit early and block on tree activation

cc/scheduler/scheduler_state_machine.h

 // 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.
 
 #ifndef CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_
 #define CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 37 matching lines @@
     BEGIN_FRAME_STATE_INSIDE_BEGIN_FRAME,
     BEGIN_FRAME_STATE_DEADLINE_PENDING,
     BEGIN_FRAME_STATE_INSIDE_DEADLINE,
   };
 
   enum CommitState {
     COMMIT_STATE_IDLE,
     COMMIT_STATE_FRAME_IN_PROGRESS,
     COMMIT_STATE_READY_TO_COMMIT,
     COMMIT_STATE_WAITING_FOR_ACTIVATION,
+    COMMIT_STATE_WAITING_FOR_ACTIVATION_AND_FRAME_IN_PROGRESS,
     COMMIT_STATE_WAITING_FOR_FIRST_DRAW,
   };
 
   enum TextureState {
     LAYER_TEXTURE_STATE_UNLOCKED,
     LAYER_TEXTURE_STATE_ACQUIRED_BY_MAIN_THREAD,
     LAYER_TEXTURE_STATE_ACQUIRED_BY_IMPL_THREAD,
   };
 
   enum SynchronousReadbackState {
     READBACK_STATE_IDLE,
     READBACK_STATE_FORCED_COMMIT_REQUESTED,
     READBACK_STATE_FORCED_COMMIT_PENDING,
     READBACK_STATE_WAITING_FOR_ACTIVATION,
     READBACK_STATE_WAITING_FOR_DRAW_AND_READBACK,
     READBACK_STATE_REPLACEMENT_COMMIT_PENDING,
     READBACK_STATE_REPLACEMENT_COMMIT_ACTIVATING,
   };
 
   enum ForcedRedrawOnTimeoutState {
     FORCED_REDRAW_STATE_IDLE,
     FORCED_REDRAW_STATE_WAITING_FOR_COMMIT,
     FORCED_REDRAW_STATE_WAITING_FOR_ACTIVATION,
     FORCED_REDRAW_STATE_WAITING_FOR_DRAW,
   };
 
   bool CommitPending() const {
-    return commit_state_ == COMMIT_STATE_FRAME_IN_PROGRESS;
+    return commit_state_ == COMMIT_STATE_FRAME_IN_PROGRESS ||
+           commit_state_ == COMMIT_STATE_WAITING_FOR_ACTIVATION_AND_FRAME_IN_PROGRESS;
   }
 
   bool RedrawPending() const { return needs_redraw_; }
 
   enum Action {
     ACTION_NONE,
     ACTION_SEND_BEGIN_FRAME_TO_MAIN_THREAD,
     ACTION_COMMIT,
     ACTION_UPDATE_VISIBLE_TILES,
     ACTION_ACTIVATE_PENDING_TREE,
@@ skipping 154 matching lines @@
   bool draw_if_possible_failed_;
   bool did_create_and_initialize_first_output_surface_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SchedulerStateMachine);
 };
 
 }  // namespace cc
 
 #endif  // CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_