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

Unified Diff: cc/scheduler/scheduler.cc

Issue 17587014: cc: Fix infinite BeginFrame that Scheduler causes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch to land Created 7 years, 6 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_settings.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 8329e8e9601b823f1293d842f7e55ed4fe7a40fe..edf5e2549d54d0554995c6352db047a1018c27e9 100644
--- a/cc/scheduler/scheduler.cc
+++ b/cc/scheduler/scheduler.cc
@@ -132,7 +132,8 @@ void Scheduler::SetupNextBeginFrameIfNeeded() {
// because every SetNeedsBeginFrame will force a redraw.
bool proactive_begin_frame_wanted =
state_machine_.ProactiveBeginFrameWantedByImplThread() &&
- !settings_.using_synchronous_renderer_compositor;
+ !settings_.using_synchronous_renderer_compositor &&
+ settings_.throttle_frame_production;
bool needs_begin_frame = needs_begin_frame_to_draw ||
proactive_begin_frame_wanted;
bool immediate_disables_needed =
« no previous file with comments | « no previous file | cc/scheduler/scheduler_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698