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

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: Preserve brian's intent as well as fix the bug. 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 | no next file » | 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..3e85eb9c364ff4c1e700b4ae62b5d5d31088c275 100644
--- a/cc/scheduler/scheduler.cc
+++ b/cc/scheduler/scheduler.cc
@@ -133,7 +133,9 @@ void Scheduler::SetupNextBeginFrameIfNeeded() {
bool proactive_begin_frame_wanted =
state_machine_.ProactiveBeginFrameWantedByImplThread() &&
!settings_.using_synchronous_renderer_compositor;
- bool needs_begin_frame = needs_begin_frame_to_draw ||
+ bool needs_begin_frame = state_machine_.inside_begin_frame() ?
+ needs_begin_frame_to_draw :
+ needs_begin_frame_to_draw ||
dshwang 2013/06/24 18:53:20 "state_machine_.inside_begin_frame() is true" mean
proactive_begin_frame_wanted;
bool immediate_disables_needed =
settings_.using_synchronous_renderer_compositor;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698