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

Unified Diff: cc/scheduler/scheduler_state_machine.cc

Issue 2641033002: cc: Remove unused scheduler setting. (Closed)
Patch Set: Created 3 years, 11 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/scheduler/scheduler_settings.cc ('k') | cc/scheduler/scheduler_state_machine_unittest.cc » ('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 4a9a2e0991914bfea1843ceea75f23397ea56d63..91ae485850381b5ce41b3eb509a11d06deb5ba09 100644
--- a/cc/scheduler/scheduler_state_machine.cc
+++ b/cc/scheduler/scheduler_state_machine.cc
@@ -309,12 +309,7 @@ bool SchedulerStateMachine::ShouldBeginCompositorFrameSinkCreation() const {
// We only want to start output surface initialization after the
// previous commit is complete.
- // We make an exception if the embedder explicitly allows beginning output
- // surface creation while the previous commit has not been aborted. This
- // assumes that any state passed from the client during the commit will not be
- // tied to the output surface.
- if (begin_main_frame_state_ != BEGIN_MAIN_FRAME_STATE_IDLE &&
- settings_.abort_commit_before_compositor_frame_sink_creation) {
+ if (begin_main_frame_state_ != BEGIN_MAIN_FRAME_STATE_IDLE) {
return false;
}
@@ -713,11 +708,7 @@ void SchedulerStateMachine::WillBeginCompositorFrameSinkCreation() {
// The following DCHECKs make sure we are in the proper quiescent state.
// The pipeline should be flushed entirely before we start output
// surface creation to avoid complicated corner cases.
-
- // We allow output surface creation while the previous commit has not been
- // aborted if the embedder explicitly allows it.
- DCHECK(!settings_.abort_commit_before_compositor_frame_sink_creation ||
- begin_main_frame_state_ == BEGIN_MAIN_FRAME_STATE_IDLE);
+ DCHECK(begin_main_frame_state_ == BEGIN_MAIN_FRAME_STATE_IDLE);
DCHECK(!has_pending_tree_);
DCHECK(!active_tree_needs_first_draw_);
}
« no previous file with comments | « cc/scheduler/scheduler_settings.cc ('k') | cc/scheduler/scheduler_state_machine_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698