| Index: cc/scheduler/scheduler_state_machine.cc
|
| diff --git a/cc/scheduler/scheduler_state_machine.cc b/cc/scheduler/scheduler_state_machine.cc
|
| index 4ca6d431a82fa6a47d6408b707360c7aae0fb01b..2da978ea1a9ebebb32d13398c2d1a5f3b04bce8d 100644
|
| --- a/cc/scheduler/scheduler_state_machine.cc
|
| +++ b/cc/scheduler/scheduler_state_machine.cc
|
| @@ -503,7 +503,8 @@ bool SchedulerStateMachine::ShouldCommit() const {
|
|
|
| // 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;
|
| }
|
|
|
|
|