cc/scheduler_unittest.cc - Issue 11830040: cc: Do not request redraw on commit when impl-side painting

Unified Diff: cc/scheduler_unittest.cc

Issue 11830040: cc: Do not request redraw on commit when impl-side painting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@decouple_draw3

Patch Set: fix cc_unittests Created 7 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

Index: cc/scheduler_unittest.cc

diff --git a/cc/scheduler_unittest.cc b/cc/scheduler_unittest.cc

index 74384eccaabd168e0ba1a1e720a9a57d867329e3..e67ec57d68b528a0ae484c4f1af7fa89e0bff47c 100644

--- a/cc/scheduler_unittest.cc

+++ b/cc/scheduler_unittest.cc

@@ -5,6 +5,7 @@

#include "cc/scheduler.h"

#include "base/logging.h"

+#include "cc/layer_tree_settings.h"

#include "cc/test/scheduler_test_common.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -69,7 +70,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)));

+ LayerTreeSettings defaultLayerTreeSettings;

+ scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource)), defaultLayerTreeSettings);

scheduler->setCanBeginFrame(true);

scheduler->setVisible(true);

scheduler->setCanDraw(true);

@@ -103,7 +105,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)));

+ LayerTreeSettings defaultLayerTreeSettings;

+ scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource)), defaultLayerTreeSettings);

scheduler->setCanBeginFrame(true);

scheduler->setVisible(true);

scheduler->setCanDraw(true);

@@ -137,7 +140,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)));

+ LayerTreeSettings defaultLayerTreeSettings;

+ scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource)), defaultLayerTreeSettings);

scheduler->setCanBeginFrame(true);

scheduler->setVisible(true);

scheduler->setCanDraw(true);

@@ -176,7 +180,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)));

+ LayerTreeSettings defaultLayerTreeSettings;

+ scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource)), defaultLayerTreeSettings);

scheduler->setCanBeginFrame(true);

scheduler->setVisible(true);

scheduler->setCanDraw(true);

@@ -239,7 +244,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)));

+ LayerTreeSettings defaultLayerTreeSettings;

+ scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource)), defaultLayerTreeSettings);

client.setScheduler(scheduler.get());

scheduler->setCanBeginFrame(true);

scheduler->setVisible(true);

@@ -266,7 +272,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)));

+ LayerTreeSettings defaultLayerTreeSettings;

+ scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource)), defaultLayerTreeSettings);

client.setScheduler(scheduler.get());

scheduler->setCanBeginFrame(true);

scheduler->setVisible(true);

@@ -339,7 +346,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)));

+ LayerTreeSettings defaultLayerTreeSettings;

+ scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource)), defaultLayerTreeSettings);

client.setScheduler(scheduler.get());

scheduler->setCanBeginFrame(true);

scheduler->setVisible(true);

@@ -367,7 +375,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)));

+ LayerTreeSettings defaultLayerTreeSettings;

+ scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, make_scoped_ptr(new FrameRateController(timeSource)), defaultLayerTreeSettings);

client.setScheduler(scheduler.get());

scheduler->setCanBeginFrame(true);

scheduler->setVisible(true);

@@ -410,7 +419,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>());

+ LayerTreeSettings defaultLayerTreeSettings;

+ scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, controller.PassAs<FrameRateController>(), defaultLayerTreeSettings);

client.setScheduler(scheduler.get());

scheduler->setCanBeginFrame(true);

scheduler->setVisible(true);

@@ -447,7 +457,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>());

+ LayerTreeSettings defaultLayerTreeSettings;

+ scoped_ptr<Scheduler> scheduler = Scheduler::create(&client, controller.PassAs<FrameRateController>(), defaultLayerTreeSettings);

EXPECT_EQ(0, controllerPtr->numFramesPending());

« cc/scheduler_state_machine.cc ('K') | « cc/scheduler_state_machine_unittest.cc ('k') | cc/thread_proxy.cc » ('j') | no next file with comments »