| 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" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 } | 115 } |
| 116 | 116 |
| 117 int render_surface_layer_list_count() const { | 117 int render_surface_layer_list_count() const { |
| 118 return render_surface_layer_list_count_; | 118 return render_surface_layer_list_count_; |
| 119 } | 119 } |
| 120 | 120 |
| 121 scoped_ptr<FakeLayerTreeHost> CreateFakeLayerTreeHost(); | 121 scoped_ptr<FakeLayerTreeHost> CreateFakeLayerTreeHost(); |
| 122 | 122 |
| 123 private: | 123 private: |
| 124 scoped_ptr<RenderSurfaceLayerList> render_surface_layer_list_; | 124 scoped_ptr<RenderSurfaceLayerList> render_surface_layer_list_; |
| 125 scoped_ptr<std::vector<LayerImpl*> > render_surface_layer_list_impl_; | 125 scoped_ptr<std::vector<LayerImpl*>> render_surface_layer_list_impl_; |
| 126 | 126 |
| 127 FakeLayerTreeHostClient client_; | 127 FakeLayerTreeHostClient client_; |
| 128 int render_surface_layer_list_count_; | 128 int render_surface_layer_list_count_; |
| 129 }; | 129 }; |
| 130 | 130 |
| 131 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase, | 131 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase, |
| 132 public testing::Test {}; | 132 public testing::Test {}; |
| 133 | 133 |
| 134 } // namespace cc | 134 } // namespace cc |
| 135 | 135 |
| 136 #endif // CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_ | 136 #endif // CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_ |
| OLD | NEW |