| 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 #ifndef CC_LAYERS_LAYER_LISTS_H_ | 5 #ifndef CC_LAYERS_LAYER_LISTS_H_ |
| 6 #define CC_LAYERS_LAYER_LISTS_H_ | 6 #define CC_LAYERS_LAYER_LISTS_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
| 11 #include "base/memory/scoped_ptr.h" |
| 11 #include "cc/base/cc_export.h" | 12 #include "cc/base/cc_export.h" |
| 12 #include "cc/base/scoped_ptr_vector.h" | |
| 13 | 13 |
| 14 namespace cc { | 14 namespace cc { |
| 15 class Layer; | 15 class Layer; |
| 16 class LayerImpl; | 16 class LayerImpl; |
| 17 | 17 |
| 18 typedef std::vector<scoped_refptr<Layer>> LayerList; | 18 typedef std::vector<scoped_refptr<Layer>> LayerList; |
| 19 typedef ScopedPtrVector<LayerImpl> OwnedLayerImplList; | 19 typedef std::vector<scoped_ptr<LayerImpl>> OwnedLayerImplList; |
| 20 typedef std::vector<LayerImpl*> LayerImplList; | 20 typedef std::vector<LayerImpl*> LayerImplList; |
| 21 | 21 |
| 22 } // namespace cc | 22 } // namespace cc |
| 23 | 23 |
| 24 #endif // CC_LAYERS_LAYER_LISTS_H_ | 24 #endif // CC_LAYERS_LAYER_LISTS_H_ |
| OLD | NEW |