Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: cc/layers/layer_collections.h

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/layers/layer_client.h ('k') | cc/layers/layer_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_COLLECTIONS_H_ 5 #ifndef CC_LAYERS_LAYER_COLLECTIONS_H_
6 #define CC_LAYERS_LAYER_COLLECTIONS_H_ 6 #define CC_LAYERS_LAYER_COLLECTIONS_H_
7 7
8 #include <memory>
8 #include <unordered_map> 9 #include <unordered_map>
9 #include <vector> 10 #include <vector>
10 11
11 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "cc/base/cc_export.h" 13 #include "cc/base/cc_export.h"
14 14
15 namespace cc { 15 namespace cc {
16 class Layer; 16 class Layer;
17 class LayerImpl; 17 class LayerImpl;
18 18
19 using LayerList = std::vector<scoped_refptr<Layer>>; 19 using LayerList = std::vector<scoped_refptr<Layer>>;
20 using OwnedLayerImplList = std::vector<scoped_ptr<LayerImpl>>; 20 using OwnedLayerImplList = std::vector<std::unique_ptr<LayerImpl>>;
21 using LayerImplList = std::vector<LayerImpl*>; 21 using LayerImplList = std::vector<LayerImpl*>;
22 using OwnedLayerImplMap = std::unordered_map<int, scoped_ptr<LayerImpl>>; 22 using OwnedLayerImplMap = std::unordered_map<int, std::unique_ptr<LayerImpl>>;
23 using LayerImplMap = std::unordered_map<int, LayerImpl*>; 23 using LayerImplMap = std::unordered_map<int, LayerImpl*>;
24 24
25 } // namespace cc 25 } // namespace cc
26 26
27 #endif // CC_LAYERS_LAYER_COLLECTIONS_H_ 27 #endif // CC_LAYERS_LAYER_COLLECTIONS_H_
OLDNEW
« no previous file with comments | « cc/layers/layer_client.h ('k') | cc/layers/layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698