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 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "base/threading/thread_task_runner_handle.h" |
8 #include "cc/animation/animation_host.h" | 9 #include "cc/animation/animation_host.h" |
9 #include "cc/layers/layer.h" | 10 #include "cc/layers/layer.h" |
10 #include "cc/test/fake_image_serialization_processor.h" | 11 #include "cc/test/fake_image_serialization_processor.h" |
11 #include "cc/test/test_task_graph_runner.h" | 12 #include "cc/test/test_task_graph_runner.h" |
12 #include "cc/trees/layer_tree.h" | 13 #include "cc/trees/layer_tree.h" |
13 #include "cc/trees/mutator_host.h" | 14 #include "cc/trees/mutator_host.h" |
14 | 15 |
15 namespace cc { | 16 namespace cc { |
16 | 17 |
17 namespace { | 18 namespace { |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 pending_tree()->SetPropertyTrees(property_trees()); | 132 pending_tree()->SetPropertyTrees(property_trees()); |
132 TreeSynchronizer::PushLayerProperties(root_layer()->GetLayerTree(), | 133 TreeSynchronizer::PushLayerProperties(root_layer()->GetLayerTree(), |
133 pending_tree()); | 134 pending_tree()); |
134 layer_tree_->mutator_host()->PushPropertiesTo(host_impl_.mutator_host()); | 135 layer_tree_->mutator_host()->PushPropertiesTo(host_impl_.mutator_host()); |
135 | 136 |
136 pending_tree()->UpdatePropertyTreeScrollOffset(property_trees()); | 137 pending_tree()->UpdatePropertyTreeScrollOffset(property_trees()); |
137 return pending_tree()->root_layer_for_testing(); | 138 return pending_tree()->root_layer_for_testing(); |
138 } | 139 } |
139 | 140 |
140 } // namespace cc | 141 } // namespace cc |
OLD | NEW |