cc: Prevent checkerboarded animations from timing out during tests.

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/logging.h"
 #include "base/stringprintf.h"
 
 namespace cc {
@@ skipping 352 matching lines @@
 void SchedulerStateMachine::SetNeedsForcedRedraw() {
   needs_forced_redraw_ = true;
 }
 
 void SchedulerStateMachine::DidDrawIfPossibleCompleted(bool success) {
   draw_if_possible_failed_ = !success;
   if (draw_if_possible_failed_) {
     needs_redraw_ = true;
     needs_commit_ = true;
     consecutive_failed_draws_++;
-    if (consecutive_failed_draws_ >=
+    if (settings_.timeout_and_draw_when_animation_checkerboards &&
+        consecutive_failed_draws_ >=
         maximum_number_of_failed_draws_before_draw_is_forced_) {
       consecutive_failed_draws_ = 0;
       // We need to force a draw, but it doesn't make sense to do this until
       // we've committed and have new textures.
       needs_forced_redraw_after_next_commit_ = true;
     }
   } else {
     consecutive_failed_draws_ = 0;
   }
 }
@@ skipping 40 matching lines @@
   output_surface_state_ = OUTPUT_SURFACE_ACTIVE;
   SetNeedsCommit();
 }
 
 void SchedulerStateMachine::SetMaximumNumberOfFailedDrawsBeforeDrawIsForced(
     int num_draws) {
   maximum_number_of_failed_draws_before_draw_is_forced_ = num_draws;
 }
 
 }  // namespace cc