| Index: cc/test/test_web_graphics_context_3d.h
|
| diff --git a/cc/test/test_web_graphics_context_3d.h b/cc/test/test_web_graphics_context_3d.h
|
| index fba2b8d88e1b405a66ea523ea6fdc55d84f8ddad..f727a058f6b73206cc17040e4230462e308d7951 100644
|
| --- a/cc/test/test_web_graphics_context_3d.h
|
| +++ b/cc/test/test_web_graphics_context_3d.h
|
| @@ -8,12 +8,12 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| +#include <unordered_map>
|
| +#include <unordered_set>
|
| #include <vector>
|
|
|
| #include "base/callback.h"
|
| #include "base/compiler_specific.h"
|
| -#include "base/containers/hash_tables.h"
|
| -#include "base/containers/scoped_ptr_hash_map.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -405,7 +405,7 @@ class TestWebGraphicsContext3D {
|
| GLuint BoundTexture(GLenum target);
|
|
|
| private:
|
| - typedef base::hash_map<GLenum, GLuint> TargetTextureMap;
|
| + typedef std::unordered_map<GLenum, GLuint> TargetTextureMap;
|
| TargetTextureMap bound_textures_;
|
| };
|
|
|
| @@ -440,10 +440,10 @@ class TestWebGraphicsContext3D {
|
| unsigned next_image_id;
|
| unsigned next_texture_id;
|
| unsigned next_renderbuffer_id;
|
| - base::ScopedPtrHashMap<unsigned, scoped_ptr<Buffer>> buffers;
|
| - base::hash_set<unsigned> images;
|
| + std::unordered_map<unsigned, scoped_ptr<Buffer>> buffers;
|
| + std::unordered_set<unsigned> images;
|
| OrderedTextureMap textures;
|
| - base::hash_set<unsigned> renderbuffer_set;
|
| + std::unordered_set<unsigned> renderbuffer_set;
|
|
|
| private:
|
| friend class base::RefCountedThreadSafe<Namespace>;
|
| @@ -468,13 +468,13 @@ class TestWebGraphicsContext3D {
|
| int current_used_transfer_buffer_usage_bytes_;
|
| int max_used_transfer_buffer_usage_bytes_;
|
| base::Closure context_lost_callback_;
|
| - base::hash_set<unsigned> used_textures_;
|
| + std::unordered_set<unsigned> used_textures_;
|
| unsigned next_program_id_;
|
| - base::hash_set<unsigned> program_set_;
|
| + std::unordered_set<unsigned> program_set_;
|
| unsigned next_shader_id_;
|
| - base::hash_set<unsigned> shader_set_;
|
| + std::unordered_set<unsigned> shader_set_;
|
| unsigned next_framebuffer_id_;
|
| - base::hash_set<unsigned> framebuffer_set_;
|
| + std::unordered_set<unsigned> framebuffer_set_;
|
| unsigned current_framebuffer_;
|
| std::vector<TestWebGraphicsContext3D*> shared_contexts_;
|
| int max_texture_size_;
|
|
|