Index: cc/scheduler/scheduler_settings.cc |
diff --git a/cc/scheduler/scheduler_settings.cc b/cc/scheduler/scheduler_settings.cc |
index ab9add087bd9f32bca15c18081d18688ac1d4d9c..84f0fcdbe0c02b21a485af59519320166c033f35 100644 |
--- a/cc/scheduler/scheduler_settings.cc |
+++ b/cc/scheduler/scheduler_settings.cc |
@@ -10,18 +10,22 @@ |
namespace cc { |
SchedulerSettings::SchedulerSettings() |
- : begin_frame_scheduling_enabled(true), |
+ : use_external_begin_frame_source(false), |
+ forward_begin_frames_to_children(false), |
main_frame_before_activation_enabled(false), |
impl_side_painting(false), |
timeout_and_draw_when_animation_checkerboards(true), |
maximum_number_of_failed_draws_before_draw_is_forced_(3), |
using_synchronous_renderer_compositor(false), |
throttle_frame_production(true), |
- disable_hi_res_timer_tasks_on_battery(false) { |
+ disable_hi_res_timer_tasks_on_battery(false), |
+ background_frame_interval(base::TimeDelta::FromSeconds(1)) { |
} |
SchedulerSettings::SchedulerSettings(const LayerTreeSettings& settings) |
- : begin_frame_scheduling_enabled(settings.begin_frame_scheduling_enabled), |
+ : use_external_begin_frame_source(settings.use_external_begin_frame_source), |
+ forward_begin_frames_to_children( |
+ settings.forward_begin_frames_to_children), |
main_frame_before_activation_enabled( |
settings.main_frame_before_activation_enabled), |
impl_side_painting(settings.impl_side_painting), |
@@ -33,7 +37,9 @@ SchedulerSettings::SchedulerSettings(const LayerTreeSettings& settings) |
settings.using_synchronous_renderer_compositor), |
throttle_frame_production(settings.throttle_frame_production), |
disable_hi_res_timer_tasks_on_battery( |
- settings.disable_hi_res_timer_tasks_on_battery) { |
+ settings.disable_hi_res_timer_tasks_on_battery), |
+ background_frame_interval(base::TimeDelta::FromSecondsD( |
+ 1.0 / settings.background_animation_rate)) { |
} |
SchedulerSettings::~SchedulerSettings() {} |
@@ -42,8 +48,10 @@ scoped_refptr<base::debug::ConvertableToTraceFormat> |
SchedulerSettings::AsValue() const { |
scoped_refptr<base::debug::TracedValue> state = |
new base::debug::TracedValue(); |
- state->SetBoolean("begin_frame_scheduling_enabled", |
- begin_frame_scheduling_enabled); |
+ state->SetBoolean("use_external_begin_frame_source", |
+ use_external_begin_frame_source); |
+ state->SetBoolean("forward_begin_frames_to_children", |
+ forward_begin_frames_to_children); |
state->SetBoolean("main_frame_before_activation_enabled", |
main_frame_before_activation_enabled); |
state->SetBoolean("impl_side_painting", impl_side_painting); |
@@ -56,6 +64,8 @@ SchedulerSettings::AsValue() const { |
state->SetBoolean("throttle_frame_production", throttle_frame_production); |
state->SetBoolean("disable_hi_res_timer_tasks_on_battery", |
disable_hi_res_timer_tasks_on_battery); |
+ state->SetInteger("background_frame_interval", |
+ background_frame_interval.InMicroseconds()); |
return state; |
} |