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

Unified Diff: gpu/command_buffer/client/vertex_array_object_manager.h

Issue 58913003: command_buffer: Remove hash_tables.h, simplify atomicops.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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 | « gpu/command_buffer/client/query_tracker.cc ('k') | gpu/command_buffer_client.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/client/vertex_array_object_manager.h
diff --git a/gpu/command_buffer/client/vertex_array_object_manager.h b/gpu/command_buffer/client/vertex_array_object_manager.h
index 254b15da055731bcab91c9b389f6318241533f03..d5b07ec0e88e0f32edcc067d8139f6850591fb24 100644
--- a/gpu/command_buffer/client/vertex_array_object_manager.h
+++ b/gpu/command_buffer/client/vertex_array_object_manager.h
@@ -6,9 +6,9 @@
#define GPU_COMMAND_BUFFER_CLIENT_VERTEX_ARRAY_OBJECT_MANAGER_H_
#include <GLES2/gl2.h>
+#include "base/containers/hash_tables.h"
#include "base/memory/scoped_ptr.h"
#include "gles2_impl_export.h"
-#include "gpu/command_buffer/client/hash_tables.h"
#include "gpu/command_buffer/common/types.h"
namespace gpu {
@@ -93,7 +93,7 @@ class GLES2_IMPL_EXPORT VertexArrayObjectManager {
GLuint bound_element_array_buffer() const;
private:
- typedef gpu::hash_map<GLuint, VertexArrayObject*> VertexArrayObjectMap;
+ typedef base::hash_map<GLuint, VertexArrayObject*> VertexArrayObjectMap;
bool IsDefaultVAOBound() const;
« no previous file with comments | « gpu/command_buffer/client/query_tracker.cc ('k') | gpu/command_buffer_client.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698