cc: Fix infinite BeginFrame that Scheduler causes.

cc/scheduler/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 "cc/scheduler/scheduler.h"
 
 #include "base/auto_reset.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 
@@ skipping 115 matching lines @@
 }
 
 void Scheduler::SetupNextBeginFrameIfNeeded() {
   bool needs_begin_frame_to_draw =
       state_machine_.BeginFrameNeededToDrawByImplThread();
   // We want to avoid proactive begin frames with the synchronous compositor
   // because every SetNeedsBeginFrame will force a redraw.
   bool proactive_begin_frame_wanted =
       state_machine_.ProactiveBeginFrameWantedByImplThread() &&
       !settings_.using_synchronous_renderer_compositor;
-  bool needs_begin_frame = needs_begin_frame_to_draw ||
+  bool needs_begin_frame = state_machine_.inside_begin_frame() ?
+                           needs_begin_frame_to_draw :
+                           needs_begin_frame_to_draw ||

[dshwang, 2013/06/24 18:53:20]

"state_machine_.inside_begin_frame() is true" means that COMMIT is performed
now. So we don't need to be proactive.

Moreover, being proactive removes the chance to disable "reserved BeginFrame".

                            proactive_begin_frame_wanted;
   bool immediate_disables_needed =
       settings_.using_synchronous_renderer_compositor;
 
   if (needs_begin_frame_to_draw)
     safe_to_expect_begin_frame_ = true;
 
   // Determine if we need BeginFrame notifications.
   // If we do, always request the BeginFrame immediately.
   // If not, only disable on the next BeginFrame to avoid unnecessary toggles.
@@ skipping 87 matching lines @@
 
   SetupNextBeginFrameIfNeeded();
   client_->DidAnticipatedDrawTimeChange(AnticipatedDrawTime());
 }
 
 bool Scheduler::WillDrawIfNeeded() const {
   return !state_machine_.DrawSuspendedUntilCommit();
 }
 
 }  // namespace cc