cc: Remove awareness of incremental updates from state machine.

cc/CCSchedulerStateMachine.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 <wtf/Noncopyable.h>
 
@@ skipping 36 matching lines @@
     bool commitPending() const
     {
         return m_commitState != COMMIT_STATE_IDLE;
     }
 
     bool redrawPending() const { return m_needsRedraw; }
 
     enum Action {
         ACTION_NONE,
         ACTION_BEGIN_FRAME,
-        ACTION_BEGIN_UPDATE_MORE_RESOURCES,
+        ACTION_BEGIN_UPDATE_RESOURCES,
         ACTION_COMMIT,
         ACTION_DRAW_IF_POSSIBLE,
         ACTION_DRAW_FORCED,
         ACTION_BEGIN_CONTEXT_RECREATION,
         ACTION_ACQUIRE_LAYER_TEXTURES_FOR_MAIN_THREAD,
     };
     Action nextAction() const;
     void updateState(Action);
 
     // Indicates whether the scheduler needs a vsync callback in order to make
@@ skipping 24 matching lines @@
     // thread to main.
     void setNeedsCommit();
 
     // As setNeedsCommit(), but ensures the beginFrame will definitely happen even if
     // we are not visible.
     void setNeedsForcedCommit();
 
     // Call this only in response to receiving an ACTION_BEGIN_FRAME
     // from nextState. Indicates that all painting is complete and that
     // updating of compositor resources can begin.
-    void beginFrameComplete();
+    void beginFrameComplete(bool hasResourceUpdates);
 
     // Call this only in response to receiving an ACTION_BEGIN_FRAME
     // from nextState if the client rejects the beginFrame message.
     void beginFrameAborted();
 
-    // Call this only in response to receiving an ACTION_UPDATE_MORE_RESOURCES
-    // from nextState. Indicates that the specific update request completed.
-    void beginUpdateMoreResourcesComplete(bool morePending);
+    // Call this only in response to receiving an ACTION_BEGIN_UPDATE_RESOURCES
+    // from nextState. Indicates that all resource updates completed.
+    void updateResourcesComplete();
 
     // Request exclusive access to the textures that back single buffered
     // layers on behalf of the main thread. Upon acqusition,
     // ACTION_DRAW_IF_POSSIBLE will not draw until the main thread releases the
     // textures to the impl thread by committing the layers.
     void setMainThreadNeedsLayerTextures();
 
     // Indicates whether we can successfully begin a frame at this time.
     void setCanBeginFrame(bool can) { m_canBeginFrame = can; }
 
@@ skipping 23 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_mainThreadNeedsLayerTextures;
-    bool m_updateMoreResourcesPending;
+    bool m_updateResourcesCompletePending;
     bool m_insideVSync;
     bool m_visible;
     bool m_canBeginFrame;
     bool m_canDraw;
     bool m_drawIfPossibleFailed;
     TextureState m_textureState;
     ContextState m_contextState;
 };
 
 }
 
 #endif // CCSchedulerStateMachine_h