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

Unified Diff: cc/scheduler/scheduler.cc

Issue 25494009: cc: Fix disabled vsync state freezing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Now with test, and formatted Created 7 years, 2 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 | « no previous file | cc/scheduler/scheduler_state_machine.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/scheduler/scheduler.cc
diff --git a/cc/scheduler/scheduler.cc b/cc/scheduler/scheduler.cc
index 64179c7ebdd86884c568262e5f624a14cdf7312a..8de9d382686fbcf22963f69b130bc02489fc8da3 100644
--- a/cc/scheduler/scheduler.cc
+++ b/cc/scheduler/scheduler.cc
@@ -157,7 +157,7 @@ void Scheduler::SetupNextBeginFrameIfNeeded() {
// aren't expecting any more BeginFrames. This should only be needed by the
// synchronous compositor when BeginFrameNeededByImplThread is false.
if (state_machine_.ShouldPollForAnticipatedDrawTriggers()) {
- DCHECK(settings_.using_synchronous_renderer_compositor);
+ DCHECK(!state_machine_.SupportsProactiveBeginFrame());
DCHECK(!needs_begin_frame);
if (poll_for_draw_triggers_closure_.IsCancelled()) {
poll_for_draw_triggers_closure_.Reset(
« no previous file with comments | « no previous file | cc/scheduler/scheduler_state_machine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698