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

Unified Diff: cc/scheduler/scheduler.cc

Issue 1418273002: cc: Move draw params from SetExternalDrawConstraints to OnDraw (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tests fixed Created 5 years, 1 month 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
Index: cc/scheduler/scheduler.cc
diff --git a/cc/scheduler/scheduler.cc b/cc/scheduler/scheduler.cc
index 28f99ed041d7c17466d5400bf100c8a1def0f0c0..db117f2709ff78c153376fbce77851833fe732f6 100644
--- a/cc/scheduler/scheduler.cc
+++ b/cc/scheduler/scheduler.cc
@@ -135,11 +135,6 @@ void Scheduler::SetVisible(bool visible) {
ProcessScheduledActions();
}
-void Scheduler::SetResourcelessSoftareDraw(bool resourceless_draw) {
- state_machine_.SetResourcelessSoftareDraw(resourceless_draw);
- ProcessScheduledActions();
-}
-
void Scheduler::SetCanDraw(bool can_draw) {
state_machine_.SetCanDraw(can_draw);
ProcessScheduledActions();
@@ -362,17 +357,19 @@ void Scheduler::SetVideoNeedsBeginFrames(bool video_needs_begin_frames) {
ProcessScheduledActions();
}
-void Scheduler::OnDrawForOutputSurface() {
+void Scheduler::OnDrawForOutputSurface(bool resourceless_software_draw) {
DCHECK(settings_.using_synchronous_renderer_compositor);
DCHECK_EQ(state_machine_.begin_impl_frame_state(),
SchedulerStateMachine::BEGIN_IMPL_FRAME_STATE_IDLE);
DCHECK(!BeginImplFrameDeadlinePending());
+ state_machine_.SetResourcelessSoftareDraw(resourceless_software_draw);
state_machine_.OnBeginImplFrameDeadline();
ProcessScheduledActions();
state_machine_.OnBeginImplFrameIdle();
ProcessScheduledActions();
+ state_machine_.SetResourcelessSoftareDraw(false);
}
// BeginRetroFrame is called for BeginFrames that we've deferred because

Powered by Google App Engine
This is Rietveld 408576698