| 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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 void ExecuteCalculateDrawPropertiesWithPropertyTrees(LayerImpl* layer); | 112 void ExecuteCalculateDrawPropertiesWithPropertyTrees(LayerImpl* layer); |
| 113 | 113 |
| 114 RenderSurfaceLayerList* render_surface_layer_list() const { | 114 RenderSurfaceLayerList* render_surface_layer_list() const { |
| 115 return render_surface_layer_list_.get(); | 115 return render_surface_layer_list_.get(); |
| 116 } | 116 } |
| 117 | 117 |
| 118 LayerImplList* render_surface_layer_list_impl() const { | 118 LayerImplList* render_surface_layer_list_impl() const { |
| 119 return render_surface_layer_list_impl_.get(); | 119 return render_surface_layer_list_impl_.get(); |
| 120 } | 120 } |
| 121 | 121 |
| 122 const LayerList& update_layer_list() const { return update_layer_list_; } |
| 123 bool UpdateLayerListContains(int id) const; |
| 124 |
| 122 int render_surface_layer_list_count() const { | 125 int render_surface_layer_list_count() const { |
| 123 return render_surface_layer_list_count_; | 126 return render_surface_layer_list_count_; |
| 124 } | 127 } |
| 125 | 128 |
| 126 const LayerSettings& layer_settings() { return layer_settings_; } | 129 const LayerSettings& layer_settings() { return layer_settings_; } |
| 127 | 130 |
| 128 private: | 131 private: |
| 129 scoped_ptr<RenderSurfaceLayerList> render_surface_layer_list_; | 132 scoped_ptr<RenderSurfaceLayerList> render_surface_layer_list_; |
| 130 scoped_ptr<std::vector<LayerImpl*>> render_surface_layer_list_impl_; | 133 scoped_ptr<std::vector<LayerImpl*>> render_surface_layer_list_impl_; |
| 134 LayerList update_layer_list_; |
| 131 LayerSettings layer_settings_; | 135 LayerSettings layer_settings_; |
| 132 | 136 |
| 133 int render_surface_layer_list_count_; | 137 int render_surface_layer_list_count_; |
| 134 }; | 138 }; |
| 135 | 139 |
| 136 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase, | 140 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase, |
| 137 public testing::Test { | 141 public testing::Test { |
| 138 public: | 142 public: |
| 139 LayerTreeHostCommonTest(); | 143 LayerTreeHostCommonTest(); |
| 140 explicit LayerTreeHostCommonTest(const LayerTreeSettings& settings); | 144 explicit LayerTreeHostCommonTest(const LayerTreeSettings& settings); |
| 141 }; | 145 }; |
| 142 | 146 |
| 143 } // namespace cc | 147 } // namespace cc |
| 144 | 148 |
| 145 #endif // CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_ | 149 #endif // CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_ |
| OLD | NEW |