| Index: cc/test/fake_layer_tree_host.cc
|
| diff --git a/cc/test/fake_layer_tree_host.cc b/cc/test/fake_layer_tree_host.cc
|
| index 143d22ea0c8413ec8cd100e39a276c4b48d79a57..428753dc09d440b192bcf376571e2fac878af1a4 100644
|
| --- a/cc/test/fake_layer_tree_host.cc
|
| +++ b/cc/test/fake_layer_tree_host.cc
|
| @@ -6,10 +6,10 @@
|
|
|
| namespace cc {
|
| FakeLayerTreeHost::FakeLayerTreeHost(FakeLayerTreeHostClient* client,
|
| - const LayerTreeSettings& settings)
|
| - : LayerTreeHost(client, NULL, NULL, NULL, settings),
|
| + LayerTreeHost::InitParams* params)
|
| + : LayerTreeHost(params),
|
| client_(client),
|
| - host_impl_(settings, &proxy_, &manager_, nullptr),
|
| + host_impl_(*params->settings, &proxy_, &manager_, nullptr),
|
| needs_commit_(false) {
|
| client_->SetLayerTreeHost(this);
|
| }
|
| @@ -18,13 +18,16 @@ scoped_ptr<FakeLayerTreeHost> FakeLayerTreeHost::Create(
|
| FakeLayerTreeHostClient* client) {
|
| LayerTreeSettings settings;
|
| settings.verify_property_trees = true;
|
| - return make_scoped_ptr(new FakeLayerTreeHost(client, settings));
|
| + return Create(client, settings);
|
| }
|
|
|
| scoped_ptr<FakeLayerTreeHost> FakeLayerTreeHost::Create(
|
| FakeLayerTreeHostClient* client,
|
| const LayerTreeSettings& settings) {
|
| - return make_scoped_ptr(new FakeLayerTreeHost(client, settings));
|
| + LayerTreeHost::InitParams params;
|
| + params.client = client;
|
| + params.settings = &settings;
|
| + return make_scoped_ptr(new FakeLayerTreeHost(client, ¶ms));
|
| }
|
|
|
| FakeLayerTreeHost::~FakeLayerTreeHost() {
|
|
|