| 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 cb766048526708317c20e5d9d32fbf2db74548c2..03ddf3fecae5de473171bbc5a41b37c6ef343bda 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"
|
| @@ -404,7 +404,7 @@ class TestWebGraphicsContext3D {
|
| GLuint BoundTexture(GLenum target);
|
|
|
| private:
|
| - typedef base::hash_map<GLenum, GLuint> TargetTextureMap;
|
| + using TargetTextureMap = std::unordered_map<GLenum, GLuint>;
|
| TargetTextureMap bound_textures_;
|
| };
|
|
|
| @@ -439,10 +439,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>;
|
| @@ -467,13 +467,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_;
|
|
|