OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/test/fake_layer_tree_host.h" | 5 #include "cc/test/fake_layer_tree_host.h" |
6 | 6 |
7 namespace cc { | 7 namespace cc { |
8 FakeLayerTreeHost::FakeLayerTreeHost(FakeLayerTreeHostClient* client, | 8 FakeLayerTreeHost::FakeLayerTreeHost(FakeLayerTreeHostClient* client, |
9 const LayerTreeSettings& settings) | 9 LayerTreeHost::InitParams* params) |
10 : LayerTreeHost(client, NULL, NULL, NULL, settings), | 10 : LayerTreeHost(params), |
11 client_(client), | 11 client_(client), |
12 host_impl_(settings, &proxy_, &manager_, nullptr), | 12 host_impl_(*params->settings, &proxy_, &manager_, nullptr), |
13 needs_commit_(false) { | 13 needs_commit_(false) { |
14 client_->SetLayerTreeHost(this); | 14 client_->SetLayerTreeHost(this); |
15 } | 15 } |
16 | 16 |
17 scoped_ptr<FakeLayerTreeHost> FakeLayerTreeHost::Create( | 17 scoped_ptr<FakeLayerTreeHost> FakeLayerTreeHost::Create( |
18 FakeLayerTreeHostClient* client) { | 18 FakeLayerTreeHostClient* client) { |
19 LayerTreeSettings settings; | 19 LayerTreeSettings settings; |
20 settings.verify_property_trees = true; | 20 settings.verify_property_trees = true; |
21 return make_scoped_ptr(new FakeLayerTreeHost(client, settings)); | 21 return Create(client, settings); |
22 } | 22 } |
23 | 23 |
24 scoped_ptr<FakeLayerTreeHost> FakeLayerTreeHost::Create( | 24 scoped_ptr<FakeLayerTreeHost> FakeLayerTreeHost::Create( |
25 FakeLayerTreeHostClient* client, | 25 FakeLayerTreeHostClient* client, |
26 const LayerTreeSettings& settings) { | 26 const LayerTreeSettings& settings) { |
27 return make_scoped_ptr(new FakeLayerTreeHost(client, settings)); | 27 LayerTreeHost::InitParams params; |
| 28 params.client = client; |
| 29 params.settings = &settings; |
| 30 return make_scoped_ptr(new FakeLayerTreeHost(client, ¶ms)); |
28 } | 31 } |
29 | 32 |
30 FakeLayerTreeHost::~FakeLayerTreeHost() { | 33 FakeLayerTreeHost::~FakeLayerTreeHost() { |
31 client_->SetLayerTreeHost(NULL); | 34 client_->SetLayerTreeHost(NULL); |
32 } | 35 } |
33 | 36 |
34 void FakeLayerTreeHost::SetNeedsCommit() { needs_commit_ = true; } | 37 void FakeLayerTreeHost::SetNeedsCommit() { needs_commit_ = true; } |
35 | 38 |
36 LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() { | 39 LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() { |
37 scoped_ptr<LayerImpl> old_root_layer_impl = active_tree()->DetachLayerTree(); | 40 scoped_ptr<LayerImpl> old_root_layer_impl = active_tree()->DetachLayerTree(); |
38 | 41 |
39 scoped_ptr<LayerImpl> layer_impl = TreeSynchronizer::SynchronizeTrees( | 42 scoped_ptr<LayerImpl> layer_impl = TreeSynchronizer::SynchronizeTrees( |
40 root_layer(), old_root_layer_impl.Pass(), active_tree()); | 43 root_layer(), old_root_layer_impl.Pass(), active_tree()); |
41 TreeSynchronizer::PushProperties(root_layer(), layer_impl.get()); | 44 TreeSynchronizer::PushProperties(root_layer(), layer_impl.get()); |
42 | 45 |
43 active_tree()->SetRootLayer(layer_impl.Pass()); | 46 active_tree()->SetRootLayer(layer_impl.Pass()); |
44 return active_tree()->root_layer(); | 47 return active_tree()->root_layer(); |
45 } | 48 } |
46 | 49 |
47 } // namespace cc | 50 } // namespace cc |
OLD | NEW |