Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Unified Diff: cc/scheduler/scheduler_state_machine.cc

Issue 2717553005: cc: Glue LTHI and Scheduler changes for checker-imaging. (Closed)
Patch Set: .. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/playback/raster_source.cc ('k') | cc/test/layer_tree_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « cc/playback/raster_source.cc ('k') | cc/test/layer_tree_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698