| Index: cc/scheduler/scheduler_unittest.cc
|
| diff --git a/cc/scheduler/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc
|
| index 9667d7c449cd8054d92219f1430a032a081a07a6..371d56a37f4b11f4a1c7d9a3ee27e805b24d4d07 100644
|
| --- a/cc/scheduler/scheduler_unittest.cc
|
| +++ b/cc/scheduler/scheduler_unittest.cc
|
| @@ -114,8 +114,7 @@ class FakeSchedulerClient : public SchedulerClient {
|
|
|
| TestScheduler* CreateScheduler(const SchedulerSettings& settings) {
|
| scoped_ptr<FakeExternalBeginFrameSource> fake_external_begin_frame_source;
|
| - if (settings.begin_frame_scheduling_enabled &&
|
| - settings.throttle_frame_production) {
|
| + if (settings.begin_frame_receiver && settings.throttle_frame_production) {
|
| fake_external_begin_frame_source.reset(
|
| new FakeExternalBeginFrameSource(this));
|
| fake_external_begin_frame_source_ =
|
| @@ -150,7 +149,7 @@ class FakeSchedulerClient : public SchedulerClient {
|
| }
|
|
|
| bool ExternalBeginFrame() {
|
| - return scheduler_->settings().begin_frame_scheduling_enabled &&
|
| + return scheduler_->settings().begin_frame_receiver &&
|
| scheduler_->settings().throttle_frame_production;
|
| }
|
|
|
| @@ -1414,12 +1413,11 @@ TEST(SchedulerTest, BeginRetroFrame_SwapThrottled) {
|
| client.Reset();
|
| }
|
|
|
| -void BeginFramesNotFromClient(bool begin_frame_scheduling_enabled,
|
| +void BeginFramesNotFromClient(bool begin_frame_receiver,
|
| bool throttle_frame_production) {
|
| FakeSchedulerClient client;
|
| SchedulerSettings scheduler_settings;
|
| - scheduler_settings.begin_frame_scheduling_enabled =
|
| - begin_frame_scheduling_enabled;
|
| + scheduler_settings.begin_frame_receiver = begin_frame_receiver;
|
| scheduler_settings.throttle_frame_production = throttle_frame_production;
|
| TestScheduler* scheduler = client.CreateScheduler(scheduler_settings);
|
| scheduler->SetCanStart();
|
| @@ -1484,32 +1482,28 @@ void BeginFramesNotFromClient(bool begin_frame_scheduling_enabled,
|
| }
|
|
|
| TEST(SchedulerTest, SyntheticBeginFrames) {
|
| - bool begin_frame_scheduling_enabled = false;
|
| + bool begin_frame_receiver = false;
|
| bool throttle_frame_production = true;
|
| - BeginFramesNotFromClient(begin_frame_scheduling_enabled,
|
| - throttle_frame_production);
|
| + BeginFramesNotFromClient(begin_frame_receiver, throttle_frame_production);
|
| }
|
|
|
| TEST(SchedulerTest, VSyncThrottlingDisabled) {
|
| - bool begin_frame_scheduling_enabled = true;
|
| + bool begin_frame_receiver = true;
|
| bool throttle_frame_production = false;
|
| - BeginFramesNotFromClient(begin_frame_scheduling_enabled,
|
| - throttle_frame_production);
|
| + BeginFramesNotFromClient(begin_frame_receiver, throttle_frame_production);
|
| }
|
|
|
| TEST(SchedulerTest, SyntheticBeginFrames_And_VSyncThrottlingDisabled) {
|
| - bool begin_frame_scheduling_enabled = false;
|
| + bool begin_frame_receiver = false;
|
| bool throttle_frame_production = false;
|
| - BeginFramesNotFromClient(begin_frame_scheduling_enabled,
|
| - throttle_frame_production);
|
| + BeginFramesNotFromClient(begin_frame_receiver, throttle_frame_production);
|
| }
|
|
|
| -void BeginFramesNotFromClient_SwapThrottled(bool begin_frame_scheduling_enabled,
|
| +void BeginFramesNotFromClient_SwapThrottled(bool begin_frame_receiver,
|
| bool throttle_frame_production) {
|
| FakeSchedulerClient client;
|
| SchedulerSettings scheduler_settings;
|
| - scheduler_settings.begin_frame_scheduling_enabled =
|
| - begin_frame_scheduling_enabled;
|
| + scheduler_settings.begin_frame_receiver = begin_frame_receiver;
|
| scheduler_settings.throttle_frame_production = throttle_frame_production;
|
| TestScheduler* scheduler = client.CreateScheduler(scheduler_settings);
|
| scheduler->SetCanStart();
|
| @@ -1573,24 +1567,24 @@ void BeginFramesNotFromClient_SwapThrottled(bool begin_frame_scheduling_enabled,
|
| }
|
|
|
| TEST(SchedulerTest, SyntheticBeginFrames_SwapThrottled) {
|
| - bool begin_frame_scheduling_enabled = false;
|
| + bool begin_frame_receiver = false;
|
| bool throttle_frame_production = true;
|
| - BeginFramesNotFromClient_SwapThrottled(begin_frame_scheduling_enabled,
|
| + BeginFramesNotFromClient_SwapThrottled(begin_frame_receiver,
|
| throttle_frame_production);
|
| }
|
|
|
| TEST(SchedulerTest, VSyncThrottlingDisabled_SwapThrottled) {
|
| - bool begin_frame_scheduling_enabled = true;
|
| + bool begin_frame_receiver = true;
|
| bool throttle_frame_production = false;
|
| - BeginFramesNotFromClient_SwapThrottled(begin_frame_scheduling_enabled,
|
| + BeginFramesNotFromClient_SwapThrottled(begin_frame_receiver,
|
| throttle_frame_production);
|
| }
|
|
|
| TEST(SchedulerTest,
|
| SyntheticBeginFrames_And_VSyncThrottlingDisabled_SwapThrottled) {
|
| - bool begin_frame_scheduling_enabled = false;
|
| + bool begin_frame_receiver = false;
|
| bool throttle_frame_production = false;
|
| - BeginFramesNotFromClient_SwapThrottled(begin_frame_scheduling_enabled,
|
| + BeginFramesNotFromClient_SwapThrottled(begin_frame_receiver,
|
| throttle_frame_production);
|
| }
|
|
|
| @@ -1930,7 +1924,7 @@ TEST(SchedulerTest,
|
| StopBeginFrameAfterDidLoseOutputSurfaceWithSyntheticBeginFrameSource) {
|
| FakeSchedulerClient client;
|
| SchedulerSettings scheduler_settings;
|
| - scheduler_settings.begin_frame_scheduling_enabled = false;
|
| + scheduler_settings.begin_frame_receiver = false;
|
| TestScheduler* scheduler = client.CreateScheduler(scheduler_settings);
|
| scheduler->SetCanStart();
|
| scheduler->SetVisible(true);
|
|
|