cc: Fix infinite BeginFrame that Scheduler causes.

cc/scheduler/scheduler_state_machine.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_state_machine.h"
 
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 
@@ skipping 347 matching lines @@
 
   if (visible_ && swap_used_incomplete_tile_)
     return true;
 
   return needs_redraw_ && visible_ &&
          output_surface_state_ == OUTPUT_SURFACE_ACTIVE;
 }
 
 bool SchedulerStateMachine::ProactiveBeginFrameWantedByImplThread() const {
   // We should proactively request a BeginFrame if a commit is pending.
-  if (needs_commit_ || needs_forced_commit_ ||
-      commit_state_ != COMMIT_STATE_IDLE)
-    return true;
-
-  return false;
+  // However, it is not needed to be proactive inside a BeginFrame
+  // because a commit is performed now.
+  return (needs_commit_ || needs_forced_commit_ ||
+      commit_state_ != COMMIT_STATE_IDLE) &&
+      !inside_begin_frame_;

[brianderson, 2013/06/24 20:12:31]

Can you see if this works instead? I would test it myself, but my tree is broken
right now.

if (!visible_ || output_surface_state_ != OUTPUT_SURFACE_ACTIVE)
  return false;

if (needs_commit_ || needs_forced_commit_ ||
    commit_state_ != COMMIT_STATE_IDLE)
  return true;

 }
 
 void SchedulerStateMachine::DidEnterBeginFrame(const BeginFrameArgs& args) {
   inside_begin_frame_ = true;
   last_begin_frame_args_ = args;
 }
 
 void SchedulerStateMachine::DidLeaveBeginFrame() {
   current_frame_number_++;
   inside_begin_frame_ = false;
@@ skipping 87 matching lines @@
 bool SchedulerStateMachine::HasInitializedOutputSurface() const {
   return output_surface_state_ == OUTPUT_SURFACE_ACTIVE;
 }
 
 void SchedulerStateMachine::SetMaximumNumberOfFailedDrawsBeforeDrawIsForced(
     int num_draws) {
   maximum_number_of_failed_draws_before_draw_is_forced_ = num_draws;
 }
 
 }  // namespace cc