diff options
Diffstat (limited to 'cc/scheduler_unittest.cc')
| -rw-r--r-- | cc/scheduler_unittest.cc | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/cc/scheduler_unittest.cc b/cc/scheduler_unittest.cc index 74384ec..dc10309 100644 --- a/cc/scheduler_unittest.cc +++ b/cc/scheduler_unittest.cc @@ -69,7 +69,8 @@ TEST(SchedulerTest, RequestCommit) { FakeSchedulerClient client; scoped_refptr<FakeTimeSource> timeSource(new FakeTimeSource()); - scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource))); + SchedulerSettings defaultSchedulerSettings; + scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource)), defaultSchedulerSettings); scheduler->setCanBeginFrame(true); scheduler->setVisible(true); scheduler->setCanDraw(true); @@ -103,7 +104,8 @@ TEST(SchedulerTest, RequestCommitAfterBeginFrame) { FakeSchedulerClient client; scoped_refptr<FakeTimeSource> timeSource(new FakeTimeSource()); - scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource))); + SchedulerSettings defaultSchedulerSettings; + scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource)), defaultSchedulerSettings); scheduler->setCanBeginFrame(true); scheduler->setVisible(true); scheduler->setCanDraw(true); @@ -137,7 +139,8 @@ TEST(SchedulerTest, TextureAcquisitionCollision) { FakeSchedulerClient client; scoped_refptr<FakeTimeSource> timeSource(new FakeTimeSource()); - scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource))); + SchedulerSettings defaultSchedulerSettings; + scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource)), defaultSchedulerSettings); scheduler->setCanBeginFrame(true); scheduler->setVisible(true); scheduler->setCanDraw(true); @@ -176,7 +179,8 @@ TEST(SchedulerTest, VisibilitySwitchWithTextureAcquisition) { FakeSchedulerClient client; scoped_refptr<FakeTimeSource> timeSource(new FakeTimeSource()); - scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource))); + SchedulerSettings defaultSchedulerSettings; + scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource)), defaultSchedulerSettings); scheduler->setCanBeginFrame(true); scheduler->setVisible(true); scheduler->setCanDraw(true); @@ -239,7 +243,8 @@ TEST(SchedulerTest, RequestRedrawInsideDraw) { SchedulerClientThatSetNeedsDrawInsideDraw client; scoped_refptr<FakeTimeSource> timeSource(new FakeTimeSource()); - scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource))); + SchedulerSettings defaultSchedulerSettings; + scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource)), defaultSchedulerSettings); client.setScheduler(scheduler.get()); scheduler->setCanBeginFrame(true); scheduler->setVisible(true); @@ -266,7 +271,8 @@ TEST(SchedulerTest, RequestRedrawInsideFailedDraw) { SchedulerClientThatSetNeedsDrawInsideDraw client; scoped_refptr<FakeTimeSource> timeSource(new FakeTimeSource()); - scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource))); + SchedulerSettings defaultSchedulerSettings; + scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource)), defaultSchedulerSettings); client.setScheduler(scheduler.get()); scheduler->setCanBeginFrame(true); scheduler->setVisible(true); @@ -339,7 +345,8 @@ TEST(SchedulerTest, RequestCommitInsideDraw) { SchedulerClientThatSetNeedsCommitInsideDraw client; scoped_refptr<FakeTimeSource> timeSource(new FakeTimeSource()); - scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource))); + SchedulerSettings defaultSchedulerSettings; + scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource)), defaultSchedulerSettings); client.setScheduler(scheduler.get()); scheduler->setCanBeginFrame(true); scheduler->setVisible(true); @@ -367,7 +374,8 @@ TEST(SchedulerTest, RequestCommitInsideFailedDraw) { SchedulerClientThatSetNeedsDrawInsideDraw client; scoped_refptr<FakeTimeSource> timeSource(new FakeTimeSource()); - scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource))); + SchedulerSettings defaultSchedulerSettings; + scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource)), defaultSchedulerSettings); client.setScheduler(scheduler.get()); scheduler->setCanBeginFrame(true); scheduler->setVisible(true); @@ -410,7 +418,8 @@ TEST(SchedulerTest, NoBeginFrameWhenDrawFails) SchedulerClientThatSetNeedsCommitInsideDraw client; scoped_ptr<FakeFrameRateController> controller(new FakeFrameRateController(timeSource)); FakeFrameRateController* controllerPtr = controller.get(); - scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, controller.PassAs<FrameRateController>()); + SchedulerSettings defaultSchedulerSettings; + scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, controller.PassAs<FrameRateController>(), defaultSchedulerSettings); client.setScheduler(scheduler.get()); scheduler->setCanBeginFrame(true); scheduler->setVisible(true); @@ -447,7 +456,8 @@ TEST(SchedulerTest, NoBeginFrameWhenSwapFailsDuringForcedCommit) FakeSchedulerClient client; scoped_ptr<FakeFrameRateController> controller(new FakeFrameRateController(timeSource)); FakeFrameRateController* controllerPtr = controller.get(); - scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, controller.PassAs<FrameRateController>()); + SchedulerSettings defaultSchedulerSettings; + scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, controller.PassAs<FrameRateController>(), defaultSchedulerSettings); EXPECT_EQ(0, controllerPtr->numFramesPending()); |