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

Unified Diff: cc/resources/resource_provider.h

Issue 1587283002: Switch cc to std::unordered_*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@unordered-map
Patch Set: 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
Index: cc/resources/resource_provider.h
diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
index 1aed50ffab7d7b4013c13747b690d1e0bc019d7b..8855590478c457a696b3060bcf1d19ae14d51cb6 100644
--- a/cc/resources/resource_provider.h
+++ b/cc/resources/resource_provider.h
@@ -11,11 +11,12 @@
#include <deque>
#include <set>
#include <string>
+#include <unordered_map>
+#include <unordered_set>
#include <utility>
#include <vector>
#include "base/callback.h"
-#include "base/containers/hash_tables.h"
#include "base/macros.h"
#include "base/memory/linked_ptr.h"
#include "base/memory/scoped_ptr.h"
@@ -69,8 +70,8 @@ class CC_EXPORT ResourceProvider
public:
typedef std::vector<ResourceId> ResourceIdArray;
- typedef base::hash_set<ResourceId> ResourceIdSet;
- typedef base::hash_map<ResourceId, ResourceId> ResourceIdMap;
+ typedef std::unordered_set<ResourceId> ResourceIdSet;
+ typedef std::unordered_map<ResourceId, ResourceId> ResourceIdMap;
enum TextureHint {
TEXTURE_HINT_DEFAULT = 0x0,
TEXTURE_HINT_IMMUTABLE = 0x1,
@@ -501,7 +502,7 @@ class CC_EXPORT ResourceProvider
SharedBitmap* shared_bitmap;
gfx::GpuMemoryBuffer* gpu_memory_buffer;
};
- typedef base::hash_map<ResourceId, Resource> ResourceMap;
+ typedef std::unordered_map<ResourceId, Resource> ResourceMap;
struct Child {
Child();
@@ -513,7 +514,7 @@ class CC_EXPORT ResourceProvider
bool marked_for_deletion;
bool needs_sync_tokens;
};
- typedef base::hash_map<int, Child> ChildMap;
+ typedef std::unordered_map<int, Child> ChildMap;
bool ReadLockFenceHasPassed(const Resource* resource) {
return !resource->read_lock_fence.get() ||

Powered by Google App Engine
This is Rietveld 408576698