cc: Remove unused scheduler setting.

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"
 #include "base/trace_event/trace_event.h"
@@ skipping 291 matching lines @@
 
   return false;
 }
 
 bool SchedulerStateMachine::ShouldBeginCompositorFrameSinkCreation() const {
   if (!visible_)
     return false;
 
   // We only want to start output surface initialization after the
   // previous commit is complete.
-  // We make an exception if the embedder explicitly allows beginning output
-  // surface creation while the previous commit has not been aborted. This
-  // assumes that any state passed from the client during the commit will not be
-  // tied to the output surface.
-  if (begin_main_frame_state_ != BEGIN_MAIN_FRAME_STATE_IDLE &&
-      settings_.abort_commit_before_compositor_frame_sink_creation) {
+  if (begin_main_frame_state_ != BEGIN_MAIN_FRAME_STATE_IDLE) {
     return false;
   }
 
   // Make sure the BeginImplFrame from any previous CompositorFrameSinks
   // are complete before creating the new CompositorFrameSink.
   if (begin_impl_frame_state_ != BEGIN_IMPL_FRAME_STATE_IDLE)
     return false;
 
   // We want to clear the pipeline of any pending draws and activations
   // before starting output surface initialization. This allows us to avoid
@@ skipping 378 matching lines @@
   needs_prepare_tiles_ = false;
 }
 
 void SchedulerStateMachine::WillBeginCompositorFrameSinkCreation() {
   DCHECK_EQ(compositor_frame_sink_state_, COMPOSITOR_FRAME_SINK_NONE);
   compositor_frame_sink_state_ = COMPOSITOR_FRAME_SINK_CREATING;
 
   // The following DCHECKs make sure we are in the proper quiescent state.
   // The pipeline should be flushed entirely before we start output
   // surface creation to avoid complicated corner cases.
-
-  // We allow output surface creation while the previous commit has not been
-  // aborted if the embedder explicitly allows it.
-  DCHECK(!settings_.abort_commit_before_compositor_frame_sink_creation ||
-         begin_main_frame_state_ == BEGIN_MAIN_FRAME_STATE_IDLE);
+  DCHECK(begin_main_frame_state_ == BEGIN_MAIN_FRAME_STATE_IDLE);
   DCHECK(!has_pending_tree_);
   DCHECK(!active_tree_needs_first_draw_);
 }
 
 void SchedulerStateMachine::WillInvalidateCompositorFrameSink() {
   DCHECK(!invalidate_compositor_frame_sink_funnel_);
   invalidate_compositor_frame_sink_funnel_ = true;
   last_frame_number_invalidate_compositor_frame_sink_performed_ =
       current_frame_number_;
 
@@ skipping 381 matching lines @@
     case COMPOSITOR_FRAME_SINK_ACTIVE:
     case COMPOSITOR_FRAME_SINK_WAITING_FOR_FIRST_COMMIT:
     case COMPOSITOR_FRAME_SINK_WAITING_FOR_FIRST_ACTIVATION:
       return true;
   }
   NOTREACHED();
   return false;
 }
 
 }  // namespace cc