Merge 167537 - Use message passing for BeginFrameAndCommitState and clean up forced commit logic

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 CCSchedulerStateMachine_h
 #define CCSchedulerStateMachine_h
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 75 matching lines @@
     // Indicates whether ACTION_DRAW_IF_POSSIBLE drew to the screen or not.
     void didDrawIfPossibleCompleted(bool success);
 
     // Indicates that a new commit flow needs to be performed, either to pull
     // updates from the main thread to the impl, or to push deltas from the impl
     // thread to main.
     void setNeedsCommit();
 
     // As setNeedsCommit(), but ensures the beginFrame will definitely happen even if
     // we are not visible.
+    // After this call we expect to go through the forced commit flow and then return
+    // to waiting for a non-forced beginFrame to finish.
     void setNeedsForcedCommit();
 
     // Call this only in response to receiving an ACTION_BEGIN_FRAME
     // from nextState. Indicates that all painting is complete.
     void beginFrameComplete();
 
     // Call this only in response to receiving an ACTION_BEGIN_FRAME
     // from nextState if the client rejects the beginFrame message.
     void beginFrameAborted();
 
@@ skipping 31 matching lines @@
 
     int m_currentFrameNumber;
     int m_lastFrameNumberWhereDrawWasCalled;
     int m_consecutiveFailedDraws;
     int m_maximumNumberOfFailedDrawsBeforeDrawIsForced;
     bool m_needsRedraw;
     bool m_needsForcedRedraw;
     bool m_needsForcedRedrawAfterNextCommit;
     bool m_needsCommit;
     bool m_needsForcedCommit;
+    bool m_expectImmediateBeginFrame;
     bool m_mainThreadNeedsLayerTextures;
     bool m_insideVSync;
     bool m_visible;
     bool m_canBeginFrame;
     bool m_canDraw;
     bool m_drawIfPossibleFailed;
     TextureState m_textureState;
     ContextState m_contextState;
 
     DISALLOW_COPY_AND_ASSIGN(SchedulerStateMachine);
 };
 
 }
 
 #endif // CCSchedulerStateMachine_h