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

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

Issue 1587283002: Switch cc to std::unordered_*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@unordered-map
Patch Set: Fix MSVC build issue Created 4 years, 10 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.h ('k') | cc/layers/nine_patch_layer_impl_unittest.cc » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_PROTO_CONVERTER_H_ 5 #ifndef CC_LAYERS_LAYER_PROTO_CONVERTER_H_
6 #define CC_LAYERS_LAYER_PROTO_CONVERTER_H_ 6 #define CC_LAYERS_LAYER_PROTO_CONVERTER_H_
7 7
8 #include <unordered_map>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "cc/base/cc_export.h" 11 #include "cc/base/cc_export.h"
10 #include "cc/layers/layer.h" 12 #include "cc/layers/layer.h"
11 13
12 namespace cc { 14 namespace cc {
13 15
14 namespace proto { 16 namespace proto {
15 class LayerNode; 17 class LayerNode;
16 class LayerUpdate; 18 class LayerUpdate;
17 } 19 }
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 private: 59 private:
58 LayerProtoConverter(); 60 LayerProtoConverter();
59 ~LayerProtoConverter(); 61 ~LayerProtoConverter();
60 62
61 // This method is the inner recursive function for SerializeLayerProperties 63 // This method is the inner recursive function for SerializeLayerProperties
62 // declared above. 64 // declared above.
63 static void RecursivelySerializeLayerProperties( 65 static void RecursivelySerializeLayerProperties(
64 Layer* root_layer, 66 Layer* root_layer,
65 proto::LayerUpdate* layer_update); 67 proto::LayerUpdate* layer_update);
66 68
67 using LayerIdMap = base::hash_map<int, scoped_refptr<Layer>>; 69 using LayerIdMap = std::unordered_map<int, scoped_refptr<Layer>>;
68 // Start at |layer| and recursively add |layer| and all its children and 70 // Start at |layer| and recursively add |layer| and all its children and
69 // special layers to |layer_id_map|. 71 // special layers to |layer_id_map|.
70 static void RecursivelyFindAllLayers(const scoped_refptr<Layer>& layer, 72 static void RecursivelyFindAllLayers(const scoped_refptr<Layer>& layer,
71 LayerIdMap* layer_id_map); 73 LayerIdMap* layer_id_map);
72 }; 74 };
73 75
74 } // namespace cc 76 } // namespace cc
75 77
76 #endif // CC_LAYERS_LAYER_PROTO_CONVERTER_H_ 78 #endif // CC_LAYERS_LAYER_PROTO_CONVERTER_H_
OLDNEW
« no previous file with comments | « cc/layers/layer.h ('k') | cc/layers/nine_patch_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698