Switch to standard integer types in gpu/.

gpu/command_buffer/service/texture_manager.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <list>
 #include <set>
 #include <string>
 #include <vector>
-#include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
 #include "gpu/gpu_export.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gl/gl_image.h"
 
 namespace gpu {
 namespace gles2 {
@@ skipping 77 matching lines @@
   }
 
   GLint max_level() const {
     return max_level_;
   }
 
   int num_uncleared_mips() const {
     return num_uncleared_mips_;
   }
 
-  uint32 estimated_size() const {
-    return estimated_size_;
-  }
+  uint32_t estimated_size() const { return estimated_size_; }
 
   bool CanRenderTo() const {
     return target_ != GL_TEXTURE_EXTERNAL_OES;
   }
 
   // The service side OpenGL id of the texture.
   GLuint service_id() const {
     return service_id_;
   }
 
@@ skipping 133 matching lines @@
     GLint level;
     GLenum internal_format;
     GLsizei width;
     GLsizei height;
     GLsizei depth;
     GLint border;
     GLenum format;
     GLenum type;
     scoped_refptr<gl::GLImage> image;
     ImageState image_state;
-    uint32 estimated_size;
+    uint32_t estimated_size;
   };
 
   struct FaceInfo {
     FaceInfo();
     ~FaceInfo();
 
     // This is relative to base_level and max_level of a texture.
     GLsizei num_mip_levels;
     // This contains slots for all levels starting at 0.
     std::vector<LevelInfo> level_infos;
@@ skipping 211 matching lines @@
   int framebuffer_attachment_count_;
 
   // Whether the texture is immutable and no further changes to the format
   // or dimensions of the texture object can be made.
   bool immutable_;
 
   // Whether or not this texture has images.
   bool has_images_;
 
   // Size in bytes this texture is assumed to take in memory.
-  uint32 estimated_size_;
+  uint32_t estimated_size_;
 
   // Cache of the computed CanRenderCondition flag.
   CanRenderCondition can_render_condition_;
 
   // Whether we have initialized TEXTURE_MAX_ANISOTROPY to 1.
   bool texture_max_anisotropy_initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(Texture);
 };
 
@@ skipping 341 matching lines @@
     GLenum target;
     GLint level;
     GLenum internal_format;
     GLsizei width;
     GLsizei height;
     GLsizei depth;
     GLint border;
     GLenum format;
     GLenum type;
     const void* pixels;
-    uint32 pixels_size;
+    uint32_t pixels_size;
     TexImageCommandType command_type;
   };
 
   bool ValidateTexImage(
     ContextState* state,
     const char* function_name,
     const DoTexImageArguments& args,
     // Pointer to TextureRef filled in if validation successful.
     // Presumes the pointer is valid.
     TextureRef** texture_ref);
 
   void ValidateAndDoTexImage(
     DecoderTextureState* texture_state,
     ContextState* state,
     DecoderFramebufferState* framebuffer_state,
     const char* function_name,
     const DoTexImageArguments& args);
 
   struct DoTexSubImageArguments {
     GLenum target;
     GLint level;
     GLint xoffset;
     GLint yoffset;
     GLsizei width;
     GLsizei height;
     GLenum format;
     GLenum type;
     const void* pixels;
-    uint32 pixels_size;
+    uint32_t pixels_size;
     // TODO(kkinnunen): currently this is used only for TexSubImage2D.
   };
 
   bool ValidateTexSubImage(
       ContextState* state,
       const char* function_name,
       const DoTexSubImageArguments& args,
       // Pointer to TextureRef filled in if validation successful.
       // Presumes the pointer is valid.
       TextureRef** texture_ref);
@@ skipping 117 matching lines @@
  private:
   DecoderTextureState* texture_state_;
   base::TimeTicks begin_time_;
   DISALLOW_COPY_AND_ASSIGN(ScopedTextureUploadTimer);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_