Roll cc snapshot up to 127605

cc/CCSchedulerStateMachine.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 "CCSchedulerStateMachine.h"
+#include "TextStream.h"
+
 
 namespace WebCore {
 
 CCSchedulerStateMachine::CCSchedulerStateMachine()
     : m_commitState(COMMIT_STATE_IDLE)
     , m_currentFrameNumber(0)
     , m_lastFrameNumberWhereDrawWasCalled(-1)
     , m_consecutiveFailedDraws(0)
     , m_maximumNumberOfFailedDrawsBeforeDrawIsForced(3)
     , m_needsRedraw(false)
     , m_needsForcedRedraw(false)
     , m_needsForcedRedrawAfterNextCommit(false)
     , m_needsCommit(false)
     , m_needsForcedCommit(false)
     , m_mainThreadNeedsLayerTextures(false)
     , m_updateMoreResourcesPending(false)
     , m_insideVSync(false)
     , m_visible(false)
     , m_canBeginFrame(false)
-    , m_canDraw(true)
+    , m_canDraw(false)
     , m_drawIfPossibleFailed(false)
     , m_textureState(LAYER_TEXTURE_STATE_UNLOCKED)
     , m_contextState(CONTEXT_ACTIVE)
 {
 }
 
+String CCSchedulerStateMachine::toString()
+{
+    TextStream ts;
+    ts << "m_commitState = " << m_commitState << "; ";
+    ts << "m_currentFrameNumber = " << m_currentFrameNumber << "; ";
+    ts << "m_lastFrameNumberWhereDrawWasCalled = " << m_lastFrameNumberWhereDrawWasCalled << "; ";
+    ts << "m_consecutiveFailedDraws = " << m_consecutiveFailedDraws << "; ";
+    ts << "m_maximumNumberOfFailedDrawsBeforeDrawIsForced = " << m_maximumNumberOfFailedDrawsBeforeDrawIsForced << "; ";
+    ts << "m_needsRedraw = " << m_needsRedraw << "; ";
+    ts << "m_needsForcedRedraw = " << m_needsForcedRedraw << "; ";
+    ts << "m_needsForcedRedrawAfterNextCommit = " << m_needsForcedRedrawAfterNextCommit << "; ";
+    ts << "m_needsCommit = " << m_needsCommit << "; ";
+    ts << "m_needsForcedCommit = " << m_needsForcedCommit << "; ";
+    ts << "m_mainThreadNeedsLayerTextures = " << m_mainThreadNeedsLayerTextures << "; ";
+    ts << "m_updateMoreResourcesPending = " << m_updateMoreResourcesPending << "; ";
+    ts << "m_insideVSync = " << m_insideVSync << "; ";
+    ts << "m_visible = " << m_visible << "; ";
+    ts << "m_canBeginFrame = " << m_canBeginFrame << "; ";
+    ts << "m_canDraw = " << m_canDraw << "; ";
+    ts << "m_drawIfPossibleFailed = " << m_drawIfPossibleFailed << "; ";
+    ts << "m_textureState = " << m_textureState << "; ";
+    ts << "m_contextState = " << m_contextState << "; ";
+    return ts.release();
+}
+
 bool CCSchedulerStateMachine::hasDrawnThisFrame() const
 {
     return m_currentFrameNumber == m_lastFrameNumberWhereDrawWasCalled;
 }
 
 bool CCSchedulerStateMachine::drawSuspendedUntilCommit() const
 {
     if (!m_canDraw)
         return true;
     if (!m_visible)
@@ skipping 159 matching lines @@
 
 void CCSchedulerStateMachine::setMainThreadNeedsLayerTextures()
 {
     ASSERT(!m_mainThreadNeedsLayerTextures);
     ASSERT(m_textureState != LAYER_TEXTURE_STATE_ACQUIRED_BY_MAIN_THREAD);
     m_mainThreadNeedsLayerTextures = true;
 }
 
 bool CCSchedulerStateMachine::vsyncCallbackNeeded() const
 {
-    if (!m_visible || m_contextState != CONTEXT_ACTIVE) {
-        if (m_needsForcedRedraw || m_commitState == COMMIT_STATE_UPDATING_RESOURCES)
-            return true;
+    // To prevent live-lock, we must always tick when updating resources.
+    if (m_updateMoreResourcesPending || m_commitState == COMMIT_STATE_UPDATING_RESOURCES)
+        return true;
 
+    // If we can't draw, don't tick until we are notified that we can draw again.
+    if (!m_canDraw)
         return false;
-    }
 
-    return m_needsRedraw || m_needsForcedRedraw || m_commitState == COMMIT_STATE_UPDATING_RESOURCES;
+    if (m_needsForcedRedraw)
+        return true;
+
+    return m_needsRedraw && m_visible && m_contextState == CONTEXT_ACTIVE;
 }
 
 void CCSchedulerStateMachine::didEnterVSync()
 {
     m_insideVSync = true;
 }
 
 void CCSchedulerStateMachine::didLeaveVSync()
 {
     m_currentFrameNumber++;
@@ skipping 77 matching lines @@
     m_contextState = CONTEXT_ACTIVE;
     setNeedsCommit();
 }
 
 void CCSchedulerStateMachine::setMaximumNumberOfFailedDrawsBeforeDrawIsForced(int numDraws)
 {
     m_maximumNumberOfFailedDrawsBeforeDrawIsForced = numDraws;
 }
 
 }