Roll cc snapshot up to 127605

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"
 
@@ skipping 19 matching lines @@
     m_stateMachine.setCanBeginFrame(can);
     processScheduledActions();
 }
 
 void CCScheduler::setVisible(bool visible)
 {
     m_stateMachine.setVisible(visible);
     processScheduledActions();
 }
 
+void CCScheduler::setCanDraw(bool canDraw)
+{
+    m_stateMachine.setCanDraw(canDraw);
+
+    // Defer processScheduleActions so we don't recurse and commit/draw
+    // multiple frames. We can call processScheduledActions directly
+    // once it is no longer re-entrant.
+    m_frameRateController->setActive(m_stateMachine.vsyncCallbackNeeded());
+}
+
 void CCScheduler::setNeedsCommit()
 {
     m_stateMachine.setNeedsCommit();
     processScheduledActions();
 }
 
 void CCScheduler::setNeedsForcedCommit()
 {
     m_stateMachine.setNeedsForcedCommit();
     processScheduledActions();
@@ skipping 29 matching lines @@
     TRACE_EVENT0("cc", "CCScheduler::beginFrameAborted");
     m_stateMachine.beginFrameAborted();
     processScheduledActions();
 }
 
 void CCScheduler::setMaxFramesPending(int maxFramesPending)
 {
     m_frameRateController->setMaxFramesPending(maxFramesPending);
 }
 
+void CCScheduler::setSwapBuffersCompleteSupported(bool supported)
+{
+    m_frameRateController->setSwapBuffersCompleteSupported(supported);
+}
+
 void CCScheduler::didSwapBuffersComplete()
 {
     TRACE_EVENT0("cc", "CCScheduler::didSwapBuffersComplete");
     m_frameRateController->didFinishFrame();
 }
 
 void CCScheduler::didLoseContext()
 {
     TRACE_EVENT0("cc", "CCScheduler::didLoseContext");
     m_frameRateController->didAbortAllPendingFrames();
@@ skipping 19 matching lines @@
         m_updateMoreResourcesPending = false;
         m_stateMachine.beginUpdateMoreResourcesComplete(m_client->hasMoreResourceUpdates());
     }
     TRACE_EVENT0("cc", "CCScheduler::vsyncTick");
 
     m_stateMachine.didEnterVSync();
     processScheduledActions();
     m_stateMachine.didLeaveVSync();
 }
 
-CCSchedulerStateMachine::Action CCScheduler::nextAction()
-{
-    m_stateMachine.setCanDraw(m_client->canDraw());
-    return m_stateMachine.nextAction();
-}
-
 void CCScheduler::processScheduledActions()
 {
     // Early out so we don't spam TRACE_EVENTS with useless processScheduledActions.
-    if (nextAction() == CCSchedulerStateMachine::ACTION_NONE) {
+    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 = nextAction();
+        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:
@@ skipping 25 matching lines @@
             m_client->scheduledActionAcquireLayerTexturesForMainThread();
             break;
         }
     } while (action != CCSchedulerStateMachine::ACTION_NONE);
 
     // Activate or deactivate the frame rate controller.
     m_frameRateController->setActive(m_stateMachine.vsyncCallbackNeeded());
 }
 
 }