cc: Do not post task to notify Scheduler of lost context.

This fixes a race condition where, until the posted task notifying
the Scheduler has been run, the Scheduler will think that there
is an OutputSurface when there really isn't.

I added DCHECKs that fail reliably much closer to the
source in existing unit tests.

BUG=297268

Review URL: https://chromiumcodereview.appspot.com/24040004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224915 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 7 deletions

diff --git a/cc/scheduler/scheduler_state_machine.cc b/cc/scheduler/scheduler_state_machine.cc
index 0d64d2d..0178ccb 100644
--- a/cc/scheduler/scheduler_state_machine.cc
+++ b/cc/scheduler/scheduler_state_machine.cc
@@ -848,8 +848,7 @@ bool SchedulerStateMachine::ProactiveBeginFrameWantedByImplThread() const {
 void SchedulerStateMachine::OnBeginFrame(const BeginFrameArgs& args) {
   current_frame_number_++;
   last_begin_frame_args_ = args;
-  DCHECK_EQ(begin_frame_state_, BEGIN_FRAME_STATE_IDLE)
-    << *AsValue();
+  DCHECK_EQ(begin_frame_state_, BEGIN_FRAME_STATE_IDLE) << *AsValue();
   begin_frame_state_ = BEGIN_FRAME_STATE_BEGIN_FRAME_STARTING;
 }
 
@@ -861,15 +860,13 @@ void SchedulerStateMachine::OnBeginFrameDeadlinePending() {
 
 void SchedulerStateMachine::OnBeginFrameDeadline() {
   DCHECK_EQ(begin_frame_state_, BEGIN_FRAME_STATE_INSIDE_BEGIN_FRAME)
-    << *AsValue();
+      << *AsValue();
   begin_frame_state_ = BEGIN_FRAME_STATE_INSIDE_DEADLINE;
 }
 
 void SchedulerStateMachine::OnBeginFrameIdle() {
-  if (HasInitializedOutputSurface()) {
-    DCHECK_EQ(begin_frame_state_, BEGIN_FRAME_STATE_INSIDE_DEADLINE)
-        << *AsValue();
-  }
+  DCHECK_EQ(begin_frame_state_, BEGIN_FRAME_STATE_INSIDE_DEADLINE)
+      << *AsValue();
   begin_frame_state_ = BEGIN_FRAME_STATE_IDLE;
 }