cc: Glue LTHI and Scheduler changes for checker-imaging.

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 485 matching lines @@
 
   return true;
 }
 
 bool SchedulerStateMachine::ShouldCommit() const {
   if (begin_main_frame_state_ != BEGIN_MAIN_FRAME_STATE_READY_TO_COMMIT)
     return false;
 
   // We must not finish the commit until the pending tree is free.
   if (has_pending_tree_) {
-    DCHECK(settings_.main_frame_before_activation_enabled);
+    DCHECK(settings_.main_frame_before_activation_enabled ||
+           current_pending_tree_is_impl_side_);
     return false;
   }
 
   // If we only have an active tree, it is incorrect to replace it before we've
   // drawn it.
   DCHECK(!settings_.commit_to_active_tree || !active_tree_needs_first_draw_);
 
   // In browser compositor commit reclaims any resources submitted during draw.
   DCHECK(!settings_.commit_to_active_tree || !IsDrawThrottled());
 
@@ skipping 692 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