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

Unified Diff: cc/surfaces/surface_manager.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/surfaces/surface_id.h ('k') | cc/surfaces/surface_resource_holder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/surface_manager.h
diff --git a/cc/surfaces/surface_manager.h b/cc/surfaces/surface_manager.h
index d4fc144b46bd6fa09d90ca857a542b554a28c6c6..a3f7b9b19ff8cc0b466fac599d13499c9ff4d3bd 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);
};
« no previous file with comments | « cc/surfaces/surface_id.h ('k') | cc/surfaces/surface_resource_holder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698