Webview fixes for Use BeginFrameArgs

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 444 matching lines @@
 void SchedulerStateMachine::OnBeginFrame(const BeginFrameArgs& args) {
   begin_frame_count_++;
   draw_attempt_count_++;
   last_begin_frame_args_ = args;
   begin_frame_state_ = BEGIN_FRAME_STATE_INSIDE_BEGIN_FRAME;
 }
 
 bool SchedulerStateMachine::ShouldTriggerBeginFrameDeadlineEarly() const {
   // TODO(brianderson): This should take into account multiple commit sources.
   return begin_frame_state_ == BEGIN_FRAME_STATE_DEADLINE_PENDING &&
-         WillDrawNewTree();
+         WillDrawNewTree() && !settings_.using_synchronous_renderer_compositor;
 }
 
 bool SchedulerStateMachine::InsideBeginFrame() const {
   return begin_frame_state_ != BEGIN_FRAME_STATE_IDLE;
 }
 
 bool SchedulerStateMachine::WillDrawNewTree() const {
   if (settings_.impl_side_painting)
     return !active_tree_has_been_drawn_;
   else
@@ skipping 111 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