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

Unified Diff: cc/scheduler/scheduler.cc

Issue 811523002: Added ability to dynamically toggle frame throttling in the scheduler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: A few more cleanups pointed out by Brian Created 5 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.h ('k') | 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 69cd50761bee88f423b6dd91d4bdeaa0d06eebd6..ee25563a099529a923cabb5e23368d14b575a997 100644
--- a/cc/scheduler/scheduler.cc
+++ b/cc/scheduler/scheduler.cc
@@ -20,16 +20,7 @@ namespace cc {
BeginFrameSource* SchedulerFrameSourcesConstructor::ConstructPrimaryFrameSource(
Scheduler* scheduler) {
- if (!scheduler->settings_.throttle_frame_production) {
- TRACE_EVENT1("cc",
- "Scheduler::Scheduler()",
- "PrimaryFrameSource",
- "BackToBackBeginFrameSource");
- DCHECK(!scheduler->primary_frame_source_internal_);
- scheduler->primary_frame_source_internal_ =
- BackToBackBeginFrameSource::Create(scheduler->task_runner_.get());
- return scheduler->primary_frame_source_internal_.get();
- } else if (scheduler->settings_.use_external_begin_frame_source) {
+ if (scheduler->settings_.use_external_begin_frame_source) {
TRACE_EVENT1("cc",
"Scheduler::Scheduler()",
"PrimaryFrameSource",
@@ -71,6 +62,17 @@ SchedulerFrameSourcesConstructor::ConstructBackgroundFrameSource(
return scheduler->background_frame_source_internal_.get();
}
+BeginFrameSource*
+SchedulerFrameSourcesConstructor::ConstructUnthrottledFrameSource(
+ Scheduler* scheduler) {
+ TRACE_EVENT1("cc", "Scheduler::Scheduler()", "UnthrottledFrameSource",
+ "BackToBackBeginFrameSource");
+ DCHECK(!scheduler->unthrottled_frame_source_internal_);
+ scheduler->unthrottled_frame_source_internal_ =
+ BackToBackBeginFrameSource::Create(scheduler->task_runner_.get());
+ return scheduler->unthrottled_frame_source_internal_.get();
+}
+
Scheduler::Scheduler(
SchedulerClient* client,
const SchedulerSettings& scheduler_settings,
@@ -85,6 +87,7 @@ Scheduler::Scheduler(
primary_frame_source_internal_(external_begin_frame_source.Pass()),
background_frame_source_internal_(),
vsync_observer_(NULL),
+ throttle_frame_production_(scheduler_settings.throttle_frame_production),
settings_(scheduler_settings),
client_(client),
layer_tree_host_id_(layer_tree_host_id),
@@ -124,6 +127,11 @@ Scheduler::Scheduler(
frame_sources_constructor->ConstructBackgroundFrameSource(this);
frame_source_->AddSource(background_frame_source_);
+ // Unthrottled frame source
+ unthrottled_frame_source_ =
+ frame_sources_constructor->ConstructUnthrottledFrameSource(this);
+ frame_source_->AddSource(unthrottled_frame_source_);
+
SetupPowerMonitoring();
}
@@ -183,16 +191,24 @@ void Scheduler::SetCanStart() {
ProcessScheduledActions();
}
-void Scheduler::SetVisible(bool visible) {
- state_machine_.SetVisible(visible);
- if (visible) {
- frame_source_->SetActiveSource(primary_frame_source_);
+void Scheduler::UpdateActiveFrameSource() {
+ if (state_machine_.visible()) {
+ if (throttle_frame_production_) {
+ frame_source_->SetActiveSource(primary_frame_source_);
+ } else {
+ frame_source_->SetActiveSource(unthrottled_frame_source_);
+ }
} else {
frame_source_->SetActiveSource(background_frame_source_);
}
ProcessScheduledActions();
}
+void Scheduler::SetVisible(bool visible) {
+ state_machine_.SetVisible(visible);
+ UpdateActiveFrameSource();
+}
+
void Scheduler::SetCanDraw(bool can_draw) {
state_machine_.SetCanDraw(can_draw);
ProcessScheduledActions();
@@ -208,6 +224,11 @@ void Scheduler::NotifyReadyToDraw() {
// crbugs 352894, 383157, 421923.
}
+void Scheduler::SetThrottleFrameProduction(bool throttle) {
+ throttle_frame_production_ = throttle;
+ UpdateActiveFrameSource();
+}
+
void Scheduler::SetNeedsCommit() {
state_machine_.SetNeedsCommit();
ProcessScheduledActions();
« no previous file with comments | « cc/scheduler/scheduler.h ('k') | cc/scheduler/scheduler_state_machine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698