Index: gpu/command_buffer/service/image_manager.h |
diff --git a/gpu/command_buffer/service/image_manager.h b/gpu/command_buffer/service/image_manager.h |
index 8ec1e3f2fad32b108517d31eb38fc61bc33541c6..1ad020e08aface3c31c8a6833000e8ab16499b61 100644 |
--- a/gpu/command_buffer/service/image_manager.h |
+++ b/gpu/command_buffer/service/image_manager.h |
@@ -5,8 +5,10 @@ |
#ifndef GPU_COMMAND_BUFFER_SERVICE_IMAGE_MANAGER_H_ |
#define GPU_COMMAND_BUFFER_SERVICE_IMAGE_MANAGER_H_ |
-#include "base/basictypes.h" |
+#include <stdint.h> |
+ |
#include "base/containers/hash_tables.h" |
+#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
#include "gpu/gpu_export.h" |
@@ -24,12 +26,12 @@ class GPU_EXPORT ImageManager { |
~ImageManager(); |
void Destroy(bool have_context); |
- void AddImage(gl::GLImage* image, int32 service_id); |
- void RemoveImage(int32 service_id); |
- gl::GLImage* LookupImage(int32 service_id); |
+ void AddImage(gl::GLImage* image, int32_t service_id); |
+ void RemoveImage(int32_t service_id); |
+ gl::GLImage* LookupImage(int32_t service_id); |
private: |
- typedef base::hash_map<int32, scoped_refptr<gl::GLImage>> GLImageMap; |
+ typedef base::hash_map<int32_t, scoped_refptr<gl::GLImage>> GLImageMap; |
GLImageMap images_; |
DISALLOW_COPY_AND_ASSIGN(ImageManager); |