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

Unified Diff: cc/trees/layer_tree_impl.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, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | cc/trees/tree_synchronizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_impl.h
diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
index 91e346686d1367e8b497277d64772ca9ed4e4f1b..4e59132e01b8e7db64ea86bbd78a08b1e4eb861f 100644
--- a/cc/trees/layer_tree_impl.h
+++ b/cc/trees/layer_tree_impl.h
@@ -8,9 +8,9 @@
#include <map>
#include <set>
#include <string>
+#include <unordered_map>
#include <vector>
-#include "base/containers/hash_tables.h"
#include "base/macros.h"
#include "base/values.h"
#include "cc/base/synced_property.h"
@@ -482,15 +482,15 @@ class CC_EXPORT LayerTreeImpl {
scoped_refptr<SyncedElasticOverscroll> elastic_overscroll_;
- typedef base::hash_map<int, LayerImpl*> LayerIdMap;
+ using LayerIdMap = std::unordered_map<int, LayerImpl*>;
LayerIdMap layer_id_map_;
- base::hash_map<uint64_t, ElementLayers> element_layers_map_;
+ std::unordered_map<uint64_t, ElementLayers> element_layers_map_;
// Maps from clip layer ids to scroll layer ids. Note that this only includes
// the subset of clip layers that act as scrolling containers. (This is
// derived from LayerImpl::scroll_clip_layer_ and exists to avoid O(n) walks.)
- base::hash_map<int, int> clip_scroll_map_;
+ std::unordered_map<int, int> clip_scroll_map_;
// Maps scroll layer ids to scrollbar layer ids. For each scroll layer, there
// may be 1 or 2 scrollbar layers (for vertical and horizontal). (This is
« no previous file with comments | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | cc/trees/tree_synchronizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698