Index: cc/trees/layer_tree_host_unittest.cc |
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc |
index f2ed38e5fa409c2e0841a8d43d7eea03190732a4..733408d6c0097f740b85bdfc7eaf9a408351e2dd 100644 |
--- a/cc/trees/layer_tree_host_unittest.cc |
+++ b/cc/trees/layer_tree_host_unittest.cc |
@@ -2361,9 +2361,9 @@ SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestDeferCommits); |
class LayerTreeHostWithProxy : public LayerTreeHost { |
public: |
LayerTreeHostWithProxy(FakeLayerTreeHostClient* client, |
- const LayerTreeSettings& settings, |
- scoped_ptr<FakeProxy> proxy) |
- : LayerTreeHost(client, NULL, NULL, NULL, settings) { |
+ scoped_ptr<FakeProxy> proxy, |
+ LayerTreeHost::InitParams* params) |
+ : LayerTreeHost(params) { |
proxy->SetLayerTreeHost(this); |
client->SetLayerTreeHost(this); |
InitializeForTesting(proxy.Pass()); |
@@ -2383,7 +2383,10 @@ TEST(LayerTreeHostTest, LimitPartialUpdates) { |
settings.impl_side_painting = false; |
settings.max_partial_texture_updates = 10; |
- LayerTreeHostWithProxy host(&client, settings, proxy.Pass()); |
+ LayerTreeHost::InitParams params; |
+ params.client = &client; |
+ params.settings = &settings; |
+ LayerTreeHostWithProxy host(&client, proxy.Pass(), ¶ms); |
EXPECT_EQ(0u, host.MaxPartialTextureUpdates()); |
} |
@@ -2401,7 +2404,10 @@ TEST(LayerTreeHostTest, LimitPartialUpdates) { |
settings.impl_side_painting = false; |
settings.max_partial_texture_updates = 10; |
- LayerTreeHostWithProxy host(&client, settings, proxy.Pass()); |
+ LayerTreeHost::InitParams params; |
+ params.client = &client; |
+ params.settings = &settings; |
+ LayerTreeHostWithProxy host(&client, proxy.Pass(), ¶ms); |
EXPECT_EQ(5u, host.MaxPartialTextureUpdates()); |
} |
@@ -2419,7 +2425,10 @@ TEST(LayerTreeHostTest, LimitPartialUpdates) { |
settings.impl_side_painting = false; |
settings.max_partial_texture_updates = 10; |
- LayerTreeHostWithProxy host(&client, settings, proxy.Pass()); |
+ LayerTreeHost::InitParams params; |
+ params.client = &client; |
+ params.settings = &settings; |
+ LayerTreeHostWithProxy host(&client, proxy.Pass(), ¶ms); |
EXPECT_EQ(10u, host.MaxPartialTextureUpdates()); |
} |
@@ -2435,9 +2444,13 @@ TEST(LayerTreeHostTest, PartialUpdatesWithGLRenderer) { |
scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
new TestSharedBitmapManager()); |
- scoped_ptr<LayerTreeHost> host = LayerTreeHost::CreateSingleThreaded( |
- &client, &client, shared_bitmap_manager.get(), NULL, NULL, settings, |
- base::ThreadTaskRunnerHandle::Get(), nullptr); |
+ LayerTreeHost::InitParams params; |
+ params.client = &client; |
+ params.shared_bitmap_manager = shared_bitmap_manager.get(); |
+ params.settings = &settings; |
+ params.main_task_runner = base::ThreadTaskRunnerHandle::Get(); |
+ scoped_ptr<LayerTreeHost> host = |
+ LayerTreeHost::CreateSingleThreaded(&client, ¶ms); |
client.SetLayerTreeHost(host.get()); |
host->Composite(base::TimeTicks::Now()); |
@@ -2454,9 +2467,13 @@ TEST(LayerTreeHostTest, PartialUpdatesWithSoftwareRenderer) { |
scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
new TestSharedBitmapManager()); |
- scoped_ptr<LayerTreeHost> host = LayerTreeHost::CreateSingleThreaded( |
- &client, &client, shared_bitmap_manager.get(), NULL, NULL, settings, |
- base::ThreadTaskRunnerHandle::Get(), nullptr); |
+ LayerTreeHost::InitParams params; |
+ params.client = &client; |
+ params.shared_bitmap_manager = shared_bitmap_manager.get(); |
+ params.settings = &settings; |
+ params.main_task_runner = base::ThreadTaskRunnerHandle::Get(); |
+ scoped_ptr<LayerTreeHost> host = |
+ LayerTreeHost::CreateSingleThreaded(&client, ¶ms); |
client.SetLayerTreeHost(host.get()); |
host->Composite(base::TimeTicks::Now()); |
@@ -2473,9 +2490,13 @@ TEST(LayerTreeHostTest, PartialUpdatesWithDelegatingRendererAndGLContent) { |
scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
new TestSharedBitmapManager()); |
- scoped_ptr<LayerTreeHost> host = LayerTreeHost::CreateSingleThreaded( |
- &client, &client, shared_bitmap_manager.get(), NULL, NULL, settings, |
- base::ThreadTaskRunnerHandle::Get(), nullptr); |
+ LayerTreeHost::InitParams params; |
+ params.client = &client; |
+ params.shared_bitmap_manager = shared_bitmap_manager.get(); |
+ params.settings = &settings; |
+ params.main_task_runner = base::ThreadTaskRunnerHandle::Get(); |
+ scoped_ptr<LayerTreeHost> host = |
+ LayerTreeHost::CreateSingleThreaded(&client, ¶ms); |
client.SetLayerTreeHost(host.get()); |
host->Composite(base::TimeTicks::Now()); |
@@ -2493,9 +2514,13 @@ TEST(LayerTreeHostTest, |
scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
new TestSharedBitmapManager()); |
- scoped_ptr<LayerTreeHost> host = LayerTreeHost::CreateSingleThreaded( |
- &client, &client, shared_bitmap_manager.get(), NULL, NULL, settings, |
- base::ThreadTaskRunnerHandle::Get(), nullptr); |
+ LayerTreeHost::InitParams params; |
+ params.client = &client; |
+ params.shared_bitmap_manager = shared_bitmap_manager.get(); |
+ params.settings = &settings; |
+ params.main_task_runner = base::ThreadTaskRunnerHandle::Get(); |
+ scoped_ptr<LayerTreeHost> host = |
+ LayerTreeHost::CreateSingleThreaded(&client, ¶ms); |
client.SetLayerTreeHost(host.get()); |
host->Composite(base::TimeTicks::Now()); |