summaryrefslogtreecommitdiffstats
path: root/cc/surfaces/surface.h
diff options
context:
space:
mode:
authordavidben <davidben@chromium.org>2016-01-27 16:29:51 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-28 00:35:15 +0000
commit5877ffe39d049730251b7f49f890c820e26643fa (patch)
tree85afd4d3b8c30b36e911027329262a44a8ea9bc2 /cc/surfaces/surface.h
parenta4861dc20689e685d8d91c436c9b0a02fc248b4e (diff)
downloadchromium_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.h')
-rw-r--r--cc/surfaces/surface.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/surfaces/surface.h b/cc/surfaces/surface.h
index a83aee3..97706eb 100644
--- a/cc/surfaces/surface.h
+++ b/cc/surfaces/surface.h
@@ -10,10 +10,10 @@
#include <map>
#include <set>
+#include <unordered_set>
#include <vector>
#include "base/callback.h"
-#include "base/containers/hash_tables.h"
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
@@ -71,8 +71,8 @@ class CC_SURFACES_EXPORT Surface {
// Satisfy all destruction dependencies that are contained in sequences, and
// remove them from sequences.
void SatisfyDestructionDependencies(
- base::hash_set<SurfaceSequence>* sequences,
- base::hash_set<uint32_t>* valid_id_namespaces);
+ std::unordered_set<SurfaceSequence, SurfaceSequenceHash>* sequences,
+ std::unordered_set<uint32_t>* valid_id_namespaces);
size_t GetDestructionDependencyCount() const {
return destruction_dependencies_.size();
}