Merge 114599 - [chromium] Add canBeginFrame state to CCSchedulerStateMachine to suppress initializa…

Source/WebCore/platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 21 matching lines @@
     : m_commitState(COMMIT_STATE_IDLE)
     , m_currentFrameNumber(0)
     , m_lastFrameNumberWhereDrawWasCalled(-1)
     , m_needsRedraw(false)
     , m_needsForcedRedraw(false)
     , m_needsCommit(false)
     , m_needsForcedCommit(false)
     , m_updateMoreResourcesPending(false)
     , m_insideVSync(false)
     , m_visible(false)
+    , m_canBeginFrame(false)
     , m_canDraw(true)
     , m_drawIfPossibleFailed(false)
     , m_contextState(CONTEXT_ACTIVE)
 {
 }
 
 bool CCSchedulerStateMachine::hasDrawnThisFrame() const
 {
     return m_currentFrameNumber == m_lastFrameNumberWhereDrawWasCalled;
 }
@@ skipping 25 matching lines @@
         if (m_contextState != CONTEXT_ACTIVE && m_needsForcedRedraw)
             return ACTION_DRAW_FORCED;
         if (m_contextState != CONTEXT_ACTIVE && m_needsForcedCommit)
             return ACTION_BEGIN_FRAME;
         if (m_contextState == CONTEXT_LOST)
             return ACTION_BEGIN_CONTEXT_RECREATION;
         if (m_contextState == CONTEXT_RECREATING)
             return ACTION_NONE;
         if (shouldDraw())
             return m_needsForcedRedraw ? ACTION_DRAW_FORCED : ACTION_DRAW_IF_POSSIBLE;
-        if (m_needsCommit && (m_visible || m_needsForcedCommit))
+        if (m_needsCommit && ((m_visible && m_canBeginFrame) || m_needsForcedCommit))
             return ACTION_BEGIN_FRAME;
         return ACTION_NONE;
 
     case COMMIT_STATE_FRAME_IN_PROGRESS:
         if (shouldDraw())
             return m_needsForcedRedraw ? ACTION_DRAW_FORCED : ACTION_DRAW_IF_POSSIBLE;
         return ACTION_NONE;
 
     case COMMIT_STATE_UPDATING_RESOURCES:
         if (shouldDraw())
@@ skipping 147 matching lines @@
 }
 
 void CCSchedulerStateMachine::didRecreateContext()
 {
     ASSERT(m_contextState == CONTEXT_RECREATING);
     m_contextState = CONTEXT_ACTIVE;
     setNeedsCommit();
 }
 
 }