cc: Remove awareness of incremental updates from state machine.

cc/CCScheduler.cpp

 // 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.
 
 #include "config.h"
 
 #include "CCScheduler.h"
 
 #include "TraceEvent.h"
 
 namespace WebCore {
 
 CCScheduler::CCScheduler(CCSchedulerClient* client, PassOwnPtr<CCFrameRateController> frameRateController)
     : m_client(client)
     , m_frameRateController(frameRateController)
-    , m_hasMoreResourceUpdates(false)
-    , m_updateMoreResourcesPending(false)
+    , m_updateResourcesCompletePending(false)
 {
     ASSERT(m_client);
     m_frameRateController->setClient(this);
     m_frameRateController->setActive(m_stateMachine.vsyncCallbackNeeded());
 }
 
 CCScheduler::~CCScheduler()
 {
     m_frameRateController->setActive(false);
 }
@@ skipping 46 matching lines @@
 
 void CCScheduler::setMainThreadNeedsLayerTextures()
 {
     m_stateMachine.setMainThreadNeedsLayerTextures();
     processScheduledActions();
 }
 
 void CCScheduler::beginFrameComplete(bool hasResourceUpdates)
 {
     TRACE_EVENT0("cc", "CCScheduler::beginFrameComplete");
-    m_hasMoreResourceUpdates = hasResourceUpdates;
-    m_stateMachine.beginFrameComplete();
+    m_stateMachine.beginFrameComplete(hasResourceUpdates);
     processScheduledActions();
 }
 
 void CCScheduler::beginFrameAborted()
 {
     TRACE_EVENT0("cc", "CCScheduler::beginFrameAborted");
     m_stateMachine.beginFrameAborted();
     processScheduledActions();
 }
 
@@ skipping 28 matching lines @@
     processScheduledActions();
 }
 
 void CCScheduler::setTimebaseAndInterval(double timebase, double intervalSeconds)
 {
     m_frameRateController->setTimebaseAndInterval(timebase, intervalSeconds);
 }
 
 void CCScheduler::vsyncTick()
 {
-    if (m_updateMoreResourcesPending) {
-        m_updateMoreResourcesPending = false;
-        ASSERT(m_hasMoreResourceUpdates);
-        m_stateMachine.beginUpdateMoreResourcesComplete(true);
-    }
     TRACE_EVENT0("cc", "CCScheduler::vsyncTick");
-
     m_stateMachine.didEnterVSync();
     processScheduledActions();
     m_stateMachine.didLeaveVSync();
+
+    // Allow resource updates until next vsync tick.
+    if (m_updateResourcesCompletePending)
+        m_client->scheduledActionUpdateMoreResources(m_frameRateController->nextTickTimeIfActivated());
 }
 
 void CCScheduler::updateResourcesComplete()
 {
     TRACE_EVENT0("cc", "CCScheduler::updateResourcesComplete");
-    if (m_updateMoreResourcesPending) {
-        m_updateMoreResourcesPending = false;
-        m_stateMachine.beginUpdateMoreResourcesComplete(false);
-    }
-    m_hasMoreResourceUpdates = false;
+    m_stateMachine.updateResourcesComplete();
+    m_updateResourcesCompletePending = false;
     processScheduledActions();
 }
 
 void CCScheduler::processScheduledActions()
 {
     // Early out so we don't spam TRACE_EVENTS with useless processScheduledActions.
     if (m_stateMachine.nextAction() == CCSchedulerStateMachine::ACTION_NONE) {
         m_frameRateController->setActive(m_stateMachine.vsyncCallbackNeeded());
         return;
     }
 
     // This function can re-enter itself. For example, draw may call
     // setNeedsCommit. Proceeed with caution.
     CCSchedulerStateMachine::Action action;
     do {
         action = m_stateMachine.nextAction();
         m_stateMachine.updateState(action);
         TRACE_EVENT1("cc", "CCScheduler::processScheduledActions()", "action", action);
 
         switch (action) {
         case CCSchedulerStateMachine::ACTION_NONE:
             break;
         case CCSchedulerStateMachine::ACTION_BEGIN_FRAME:
             m_client->scheduledActionBeginFrame();
             break;
-        case CCSchedulerStateMachine::ACTION_BEGIN_UPDATE_MORE_RESOURCES:
-            if (m_hasMoreResourceUpdates) {
-                m_client->scheduledActionUpdateMoreResources(m_frameRateController->nextTickTimeIfActivated());
-                m_updateMoreResourcesPending = true;
-            } else
-                m_stateMachine.beginUpdateMoreResourcesComplete(false);
+        case CCSchedulerStateMachine::ACTION_BEGIN_UPDATE_RESOURCES:
+            ASSERT(!m_updateResourcesCompletePending);
+            m_client->scheduledActionUpdateMoreResources(m_frameRateController->nextTickTimeIfActivated());
+            m_updateResourcesCompletePending = true;
             break;
         case CCSchedulerStateMachine::ACTION_COMMIT:
             m_client->scheduledActionCommit();
             break;
         case CCSchedulerStateMachine::ACTION_DRAW_IF_POSSIBLE: {
             CCScheduledActionDrawAndSwapResult result = m_client->scheduledActionDrawAndSwapIfPossible();
             m_stateMachine.didDrawIfPossibleCompleted(result.didDraw);
             if (result.didSwap)
                 m_frameRateController->didBeginFrame();
             break;
@@ skipping 10 matching lines @@
             m_client->scheduledActionAcquireLayerTexturesForMainThread();
             break;
         }
     } while (action != CCSchedulerStateMachine::ACTION_NONE);
 
     // Activate or deactivate the frame rate controller.
     m_frameRateController->setActive(m_stateMachine.vsyncCallbackNeeded());
 }
 
 }