Merge 167537 - Use message passing for BeginFrameAndCommitState and clean up forced commit logic

cc/scheduler.cc

 // 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 "cc/scheduler.h"
 
 #include "base/auto_reset.h"
 #include "base/debug/trace_event.h"
@@ skipping 35 matching lines @@
 }
 
 void Scheduler::setNeedsCommit()
 {
     m_stateMachine.setNeedsCommit();
     processScheduledActions();
 }
 
 void Scheduler::setNeedsForcedCommit()
 {
+    m_stateMachine.setNeedsCommit();
     m_stateMachine.setNeedsForcedCommit();
     processScheduledActions();
 }
 
 void Scheduler::setNeedsRedraw()
 {
     m_stateMachine.setNeedsRedraw();
     processScheduledActions();
 }
 
@@ skipping 118 matching lines @@
         }
         action = m_stateMachine.nextAction();
     }
 
     // Activate or deactivate the frame rate controller.
     m_frameRateController->setActive(m_stateMachine.vsyncCallbackNeeded());
     m_client->didAnticipatedDrawTimeChange(m_frameRateController->nextTickTime());
 }
 
 }  // namespace cc