cc/layers/layer_list_iterator_unittest.cc - Issue 2171143002: cc: Get rid of non-delegated rendering in most cc unit tests.

Unified Diff: cc/layers/layer_list_iterator_unittest.cc

Issue 2171143002: cc: Get rid of non-delegated rendering in most cc unit tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@killdirecttests

Patch Set: fakeoutputsurface: cc-blink-tests Created 4 years, 5 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/layers/layer_list_iterator_unittest.cc

diff --git a/cc/layers/layer_list_iterator_unittest.cc b/cc/layers/layer_list_iterator_unittest.cc

index cb538e08817f181605ab3c034045c44be85dd940..457752dbc8adb2b91c3b75a27aa0d35727befb1f 100644

--- a/cc/layers/layer_list_iterator_unittest.cc

+++ b/cc/layers/layer_list_iterator_unittest.cc

@@ -23,7 +23,7 @@ namespace {

TEST(LayerListIteratorTest, VerifyTraversalOrder) {

// Unfortunate preamble.

- FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D);

+ FakeLayerTreeHostClient client;

TestTaskGraphRunner task_graph_runner;

std::unique_ptr<FakeLayerTreeHost> host_ptr =

FakeLayerTreeHost::Create(&client, &task_graph_runner);

@@ -75,7 +75,7 @@ TEST(LayerListIteratorTest, VerifyTraversalOrder) {

TEST(LayerListIteratorTest, VerifySingleLayer) {

// Unfortunate preamble.

- FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D);

+ FakeLayerTreeHostClient client;

TestTaskGraphRunner task_graph_runner;

std::unique_ptr<FakeLayerTreeHost> host_ptr =

FakeLayerTreeHost::Create(&client, &task_graph_runner);

@@ -108,7 +108,7 @@ TEST(LayerListIteratorTest, VerifyNullFirstLayer) {

TEST(LayerListReverseIteratorTest, VerifyTraversalOrder) {

// Unfortunate preamble.

- FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D);

+ FakeLayerTreeHostClient client;

TestTaskGraphRunner task_graph_runner;

std::unique_ptr<FakeLayerTreeHost> host_ptr =

FakeLayerTreeHost::Create(&client, &task_graph_runner);

@@ -162,7 +162,7 @@ TEST(LayerListReverseIteratorTest, VerifyTraversalOrder) {

TEST(LayerListReverseIteratorTest, VerifySingleLayer) {

// Unfortunate preamble.

- FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D);

+ FakeLayerTreeHostClient client;

TestTaskGraphRunner task_graph_runner;

std::unique_ptr<FakeLayerTreeHost> host_ptr =

FakeLayerTreeHost::Create(&client, &task_graph_runner);

@@ -200,7 +200,8 @@ TEST(LayerListIteratorTest, VerifyTraversalOrderImpl) {

FakeImplTaskRunnerProvider task_runner_provider;

TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

- std::unique_ptr<OutputSurface> output_surface = FakeOutputSurface::Create3d();

+ std::unique_ptr<OutputSurface> output_surface =

+ FakeOutputSurface::CreateDelegating3d();

FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,

&task_graph_runner);

host_impl.SetVisible(true);

@@ -254,7 +255,8 @@ TEST(LayerListIteratorTest, VerifySingleLayerImpl) {

FakeImplTaskRunnerProvider task_runner_provider;

TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

- std::unique_ptr<OutputSurface> output_surface = FakeOutputSurface::Create3d();

+ std::unique_ptr<OutputSurface> output_surface =

+ FakeOutputSurface::CreateDelegating3d();

FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,

&task_graph_runner);

host_impl.SetVisible(true);

@@ -290,7 +292,8 @@ TEST(LayerListReverseIteratorTest, VerifyTraversalOrderImpl) {

FakeImplTaskRunnerProvider task_runner_provider;

TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

- std::unique_ptr<OutputSurface> output_surface = FakeOutputSurface::Create3d();

+ std::unique_ptr<OutputSurface> output_surface =

+ FakeOutputSurface::CreateDelegating3d();

FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,

&task_graph_runner);

host_impl.SetVisible(true);

@@ -346,7 +349,8 @@ TEST(LayerListReverseIteratorTest, VerifySingleLayerImpl) {

FakeImplTaskRunnerProvider task_runner_provider;

TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

- std::unique_ptr<OutputSurface> output_surface = FakeOutputSurface::Create3d();

+ std::unique_ptr<OutputSurface> output_surface =

+ FakeOutputSurface::CreateDelegating3d();

FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,

&task_graph_runner);

host_impl.SetVisible(true);

« no previous file with comments | « cc/layers/layer_impl_unittest.cc ('k') | cc/layers/layer_perftest.cc » ('j') | cc/layers/layer_unittest.cc » ('J')