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

Unified Diff: cc/resource_provider.h

Issue 11150024: cc: Remove wtf hashmap use from resource provider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 | « no previous file | cc/resource_provider.cc » ('j') | cc/video_layer_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resource_provider.h
diff --git a/cc/resource_provider.h b/cc/resource_provider.h
index e90c1f2e9640f4d17e6158e364bc544eebc45ada..37587640c069190ce75c0dab3fb6395ba6f3064b 100644
--- a/cc/resource_provider.h
+++ b/cc/resource_provider.h
@@ -6,6 +6,7 @@
#define CCResourceProvider_h
#include "base/basictypes.h"
+#include "base/hash_tables.h"
#include "CCGraphicsContext.h"
#include "GraphicsContext3D.h"
#include "IntSize.h"
@@ -13,7 +14,6 @@
#include "SkCanvas.h"
#include "TextureCopier.h"
#include <wtf/Deque.h>
-#include <wtf/HashMap.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/PassRefPtr.h>
@@ -37,7 +37,7 @@ class CCResourceProvider {
public:
typedef unsigned ResourceId;
typedef Vector<ResourceId> ResourceIdArray;
- typedef HashMap<ResourceId, ResourceId> ResourceIdMap;
+ typedef base::hash_map<ResourceId, ResourceId> ResourceIdMap;
enum TextureUsageHint { TextureUsageAny, TextureUsageFramebuffer };
enum ResourceType {
GLTexture = 1,
@@ -228,7 +228,7 @@ private:
GC3Denum format;
ResourceType type;
};
- typedef HashMap<ResourceId, Resource> ResourceMap;
+ typedef base::hash_map<ResourceId, Resource> ResourceMap;
struct Child {
Child();
~Child();
@@ -237,7 +237,7 @@ private:
ResourceIdMap childToParentMap;
ResourceIdMap parentToChildMap;
};
- typedef HashMap<int, Child> ChildMap;
+ typedef base::hash_map<int, Child> ChildMap;
explicit CCResourceProvider(CCGraphicsContext*);
bool initialize();
« no previous file with comments | « no previous file | cc/resource_provider.cc » ('j') | cc/video_layer_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698