diff options
| author | davidben <davidben@chromium.org> | 2016-01-27 16:29:51 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-28 00:35:15 +0000 |
| commit | 5877ffe39d049730251b7f49f890c820e26643fa (patch) | |
| tree | 85afd4d3b8c30b36e911027329262a44a8ea9bc2 /cc/surfaces/surface_manager.h | |
| parent | a4861dc20689e685d8d91c436c9b0a02fc248b4e (diff) | |
| download | chromium_src-5877ffe39d049730251b7f49f890c820e26643fa.zip chromium_src-5877ffe39d049730251b7f49f890c820e26643fa.tar.gz chromium_src-5877ffe39d049730251b7f49f890c820e26643fa.tar.bz2 | |
Switch cc to std::unordered_*.
This removes all uses of base::hash_*, BASE_HASH_NAMESPACE, and
base::ScopedPtrHashMap in favor of the C++11 versions.
BUG=576864, 579229
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1587283002
Cr-Commit-Position: refs/heads/master@{#371937}
Diffstat (limited to 'cc/surfaces/surface_manager.h')
| -rw-r--r-- | cc/surfaces/surface_manager.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/surfaces/surface_manager.h b/cc/surfaces/surface_manager.h index d4fc144..a3f7b9b 100644 --- a/cc/surfaces/surface_manager.h +++ b/cc/surfaces/surface_manager.h @@ -9,9 +9,9 @@ #include <list> #include <unordered_map> +#include <unordered_set> #include <vector> -#include "base/containers/hash_tables.h" #include "base/macros.h" #include "base/observer_list.h" #include "base/threading/thread_checker.h" @@ -73,12 +73,12 @@ class CC_SURFACES_EXPORT SurfaceManager { // Set of SurfaceSequences that have been satisfied by a frame but not yet // waited on. - base::hash_set<SurfaceSequence> satisfied_sequences_; + std::unordered_set<SurfaceSequence, SurfaceSequenceHash> satisfied_sequences_; // Set of valid surface ID namespaces. When a namespace is removed from // this set, any remaining sequences with that namespace are considered // satisfied. - base::hash_set<uint32_t> valid_surface_id_namespaces_; + std::unordered_set<uint32_t> valid_surface_id_namespaces_; DISALLOW_COPY_AND_ASSIGN(SurfaceManager); }; |