cc: Make the scheduler compositeAndReadback flow not race with WAITING_FOR_FIRST_DRAW

cc/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_STATE_MACHINE_H_
 #define CC_SCHEDULER_STATE_MACHINE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 13 matching lines @@
 // make testing cleaner.
 class CC_EXPORT SchedulerStateMachine {
 public:
     SchedulerStateMachine();
 
     enum CommitState {
         COMMIT_STATE_IDLE,
         COMMIT_STATE_FRAME_IN_PROGRESS,
         COMMIT_STATE_READY_TO_COMMIT,
         COMMIT_STATE_WAITING_FOR_FIRST_DRAW,
-    };
+        COMMIT_STATE_WAITING_FOR_FIRST_FORCED_DRAW,
+   };
 
     enum TextureState {
         LAYER_TEXTURE_STATE_UNLOCKED,
         LAYER_TEXTURE_STATE_ACQUIRED_BY_MAIN_THREAD,
         LAYER_TEXTURE_STATE_ACQUIRED_BY_IMPL_THREAD,
     };
 
     enum OutputSurfaceState {
         OUTPUT_SURFACE_ACTIVE,
         OUTPUT_SURFACE_LOST,
         OUTPUT_SURFACE_RECREATING,
     };
 
     bool commitPending() const
     {
-        return m_commitState != COMMIT_STATE_IDLE;
+        return m_commitState == COMMIT_STATE_FRAME_IN_PROGRESS ||
+            m_commitState == COMMIT_STATE_READY_TO_COMMIT;
     }
 
     bool redrawPending() const { return m_needsRedraw; }
 
     enum Action {
         ACTION_NONE,
         ACTION_BEGIN_FRAME,
         ACTION_COMMIT,
         ACTION_DRAW_IF_POSSIBLE,
         ACTION_DRAW_FORCED,
@@ skipping 95 matching lines @@
     bool m_drawIfPossibleFailed;
     TextureState m_textureState;
     OutputSurfaceState m_outputSurfaceState;
 
     DISALLOW_COPY_AND_ASSIGN(SchedulerStateMachine);
 };
 
 }
 
 #endif  // CC_SCHEDULER_STATE_MACHINE_H_