OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_ | 5 #ifndef CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_ |
6 #define CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_ | 6 #define CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
11 #include "cc/layers/layer_lists.h" | 11 #include "cc/layers/layer_lists.h" |
12 #include "cc/test/fake_layer_tree_host_client.h" | 12 #include "cc/test/fake_layer_tree_host_client.h" |
| 13 #include "cc/test/test_task_graph_runner.h" |
13 #include "cc/trees/layer_tree_settings.h" | 14 #include "cc/trees/layer_tree_settings.h" |
14 #include "cc/trees/property_tree.h" | 15 #include "cc/trees/property_tree.h" |
15 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
16 | 17 |
17 namespace gfx { | 18 namespace gfx { |
18 class PointF; | 19 class PointF; |
19 class Point3F; | 20 class Point3F; |
20 class Size; | 21 class Size; |
21 class Transform; | 22 class Transform; |
22 } | 23 } |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 scoped_ptr<FakeLayerTreeHost> CreateFakeLayerTreeHost(); | 125 scoped_ptr<FakeLayerTreeHost> CreateFakeLayerTreeHost(); |
125 | 126 |
126 const LayerSettings& layer_settings() { return layer_settings_; } | 127 const LayerSettings& layer_settings() { return layer_settings_; } |
127 | 128 |
128 private: | 129 private: |
129 scoped_ptr<RenderSurfaceLayerList> render_surface_layer_list_; | 130 scoped_ptr<RenderSurfaceLayerList> render_surface_layer_list_; |
130 scoped_ptr<std::vector<LayerImpl*>> render_surface_layer_list_impl_; | 131 scoped_ptr<std::vector<LayerImpl*>> render_surface_layer_list_impl_; |
131 LayerSettings layer_settings_; | 132 LayerSettings layer_settings_; |
132 | 133 |
133 FakeLayerTreeHostClient client_; | 134 FakeLayerTreeHostClient client_; |
| 135 TestTaskGraphRunner task_graph_runner_; |
134 int render_surface_layer_list_count_; | 136 int render_surface_layer_list_count_; |
135 }; | 137 }; |
136 | 138 |
137 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase, | 139 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase, |
138 public testing::Test {}; | 140 public testing::Test {}; |
139 | 141 |
140 } // namespace cc | 142 } // namespace cc |
141 | 143 |
142 #endif // CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_ | 144 #endif // CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_ |
OLD | NEW |