Chromium Code Reviews| Index: cc/scheduler/scheduler_settings.cc |
| diff --git a/cc/scheduler/scheduler_settings.cc b/cc/scheduler/scheduler_settings.cc |
| index ab9add087bd9f32bca15c18081d18688ac1d4d9c..81a57f1b01362ff0bf7cb6ed0808a0299c81fff5 100644 |
| --- a/cc/scheduler/scheduler_settings.cc |
| +++ b/cc/scheduler/scheduler_settings.cc |
| @@ -10,7 +10,8 @@ |
| namespace cc { |
| SchedulerSettings::SchedulerSettings() |
| - : begin_frame_scheduling_enabled(true), |
| + : begin_frame_receiver(true), |
|
piman
2014/11/05 00:39:14
nit: it would be good to have the same default her
simonhong
2014/11/10 13:18:08
Done.
|
| + begin_frame_publisher(false), |
| main_frame_before_activation_enabled(false), |
| impl_side_painting(false), |
| timeout_and_draw_when_animation_checkerboards(true), |
| @@ -21,7 +22,8 @@ SchedulerSettings::SchedulerSettings() |
| } |
| SchedulerSettings::SchedulerSettings(const LayerTreeSettings& settings) |
| - : begin_frame_scheduling_enabled(settings.begin_frame_scheduling_enabled), |
| + : begin_frame_receiver(settings.begin_frame_receiver), |
| + begin_frame_publisher(settings.begin_frame_publisher), |
| main_frame_before_activation_enabled( |
| settings.main_frame_before_activation_enabled), |
| impl_side_painting(settings.impl_side_painting), |
| @@ -42,8 +44,8 @@ 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("begin_frame_receiver", begin_frame_receiver); |
| + state->SetBoolean("begin_frame_publisher", begin_frame_publisher); |
| state->SetBoolean("main_frame_before_activation_enabled", |
| main_frame_before_activation_enabled); |
| state->SetBoolean("impl_side_painting", impl_side_painting); |