| Index: cc/layers/solid_color_layer_impl_unittest.cc
|
| diff --git a/cc/layers/solid_color_layer_impl_unittest.cc b/cc/layers/solid_color_layer_impl_unittest.cc
|
| index 9cfd2efd99faebfc3569b5d0858c03e2f0f4e80b..8d3278044fdc7ad33473dd036c85e098e4605211 100644
|
| --- a/cc/layers/solid_color_layer_impl_unittest.cc
|
| +++ b/cc/layers/solid_color_layer_impl_unittest.cc
|
| @@ -12,7 +12,7 @@
|
| #include "cc/test/fake_impl_proxy.h"
|
| #include "cc/test/fake_layer_tree_host.h"
|
| #include "cc/test/layer_test_common.h"
|
| -#include "cc/test/test_shared_bitmap_manager.h"
|
| +#include "cc/test/test_task_graph_runner.h"
|
| #include "cc/trees/single_thread_proxy.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -27,8 +27,8 @@ TEST(SolidColorLayerImplTest, VerifyTilingCompleteAndNoOverlap) {
|
| gfx::Rect visible_content_rect = gfx::Rect(layer_size);
|
|
|
| FakeImplProxy proxy;
|
| - TestSharedBitmapManager shared_bitmap_manager;
|
| - FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr);
|
| + TestTaskGraphRunner task_graph_runner;
|
| + FakeLayerTreeHostImpl host_impl(&proxy, nullptr, &task_graph_runner);
|
| scoped_ptr<SolidColorLayerImpl> layer =
|
| SolidColorLayerImpl::Create(host_impl.active_tree(), 1);
|
| layer->draw_properties().visible_content_rect = visible_content_rect;
|
| @@ -53,8 +53,8 @@ TEST(SolidColorLayerImplTest, VerifyCorrectBackgroundColorInQuad) {
|
| gfx::Rect visible_content_rect = gfx::Rect(layer_size);
|
|
|
| FakeImplProxy proxy;
|
| - TestSharedBitmapManager shared_bitmap_manager;
|
| - FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr);
|
| + TestTaskGraphRunner task_graph_runner;
|
| + FakeLayerTreeHostImpl host_impl(&proxy, nullptr, &task_graph_runner);
|
| scoped_ptr<SolidColorLayerImpl> layer =
|
| SolidColorLayerImpl::Create(host_impl.active_tree(), 1);
|
| layer->draw_properties().visible_content_rect = visible_content_rect;
|
| @@ -82,8 +82,8 @@ TEST(SolidColorLayerImplTest, VerifyCorrectOpacityInQuad) {
|
| gfx::Rect visible_content_rect = gfx::Rect(layer_size);
|
|
|
| FakeImplProxy proxy;
|
| - TestSharedBitmapManager shared_bitmap_manager;
|
| - FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr);
|
| + TestTaskGraphRunner task_graph_runner;
|
| + FakeLayerTreeHostImpl host_impl(&proxy, nullptr, &task_graph_runner);
|
| scoped_ptr<SolidColorLayerImpl> layer =
|
| SolidColorLayerImpl::Create(host_impl.active_tree(), 1);
|
| layer->draw_properties().visible_content_rect = visible_content_rect;
|
| @@ -111,8 +111,8 @@ TEST(SolidColorLayerImplTest, VerifyCorrectBlendModeInQuad) {
|
| gfx::Rect visible_content_rect = gfx::Rect(layer_size);
|
|
|
| FakeImplProxy proxy;
|
| - TestSharedBitmapManager shared_bitmap_manager;
|
| - FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr);
|
| + TestTaskGraphRunner task_graph_runner;
|
| + FakeLayerTreeHostImpl host_impl(&proxy, nullptr, &task_graph_runner);
|
| scoped_ptr<SolidColorLayerImpl> layer =
|
| SolidColorLayerImpl::Create(host_impl.active_tree(), 1);
|
| layer->SetBounds(layer_size);
|
| @@ -142,7 +142,9 @@ TEST(SolidColorLayerImplTest, VerifyOpaqueRect) {
|
| root->AddChild(layer);
|
|
|
| FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D);
|
| - scoped_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create(&client);
|
| + TestTaskGraphRunner task_graph_runner;
|
| + scoped_ptr<FakeLayerTreeHost> host =
|
| + FakeLayerTreeHost::Create(&client, &task_graph_runner);
|
| host->SetRootLayer(root);
|
|
|
| RenderSurfaceLayerList render_surface_layer_list;
|
|
|