Switch to standard integer types in gpu/.

gpu/command_buffer/service/program_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_PROGRAM_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <map>
 #include <string>
 #include <vector>
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "gpu/command_buffer/service/common_decoder.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/shader_manager.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 namespace gles2 {
 
@@ skipping 66 matching lines @@
                 bool _is_array,
                 const std::vector<GLint>& service_locations);
     ~UniformInfo();
     bool IsSampler() const {
       return type == GL_SAMPLER_2D || type == GL_SAMPLER_2D_RECT_ARB ||
              type == GL_SAMPLER_CUBE || type == GL_SAMPLER_EXTERNAL_OES;
     }
 
     GLsizei size;
     GLenum type;
-    uint32 accepts_api_type;
+    uint32_t accepts_api_type;
     GLint fake_location_base;
     bool is_array;
     std::string name;
     std::vector<GLint> element_locations;
     std::vector<GLuint> texture_units;
   };
   struct VertexAttrib {
     VertexAttrib(GLsizei _size, GLenum _type, const std::string& _name,
                  GLint _location)
         : size(_size),
@@ skipping 315 matching lines @@
       const std::string& prefix);
 
   // Get UniformBlock from InterfaceBlock
   void GetUniformBlockFromInterfaceBlock(
       Shader* shader, const sh::InterfaceBlock& interface_block);
 
   // Get UniformBlocks info
   void GatherInterfaceBlockInfo();
 
   // Clears all the uniforms.
-  void ClearUniforms(std::vector<uint8>* zero_buffer);
+  void ClearUniforms(std::vector<uint8_t>* zero_buffer);
 
   // If long attribate names are mapped during shader translation, call
   // glBindAttribLocation() again with the mapped names.
   // This is called right before the glLink() call, but after shaders are
   // translated.
   void ExecuteBindAttribLocationCalls();
 
   // The names of transform feedback varyings need to be hashed just
   // like bound attributes' locations, just before the link call.
   // Returns false upon failure.
@@ skipping 86 matching lines @@
   LocationIndexMap bind_program_output_location_index_map_;
 };
 
 // Tracks the Programs.
 //
 // NOTE: To support shared resources an instance of this class will
 // need to be shared by multiple GLES2Decoders.
 class GPU_EXPORT ProgramManager {
  public:
   explicit ProgramManager(ProgramCache* program_cache,
-                          uint32 max_varying_vectors,
-                          uint32 max_dual_source_draw_buffers,
+                          uint32_t max_varying_vectors,
+                          uint32_t max_dual_source_draw_buffers,
                           FeatureInfo* feature_info);
   ~ProgramManager();
 
   // Must call before destruction.
   void Destroy(bool have_context);
 
   // Creates a new program.
   Program* CreateProgram(GLuint client_id, GLuint service_id);
 
   // Gets a program.
@@ skipping 17 matching lines @@
   // Clears the uniforms for this program.
   void ClearUniforms(Program* program);
 
   // Returns true if |name| has a prefix that is intended for GL built-in shader
   // variables.
   static bool HasBuiltInPrefix(const std::string& name);
 
   // Check if a Program is owned by this ProgramManager.
   bool IsOwned(Program* program) const;
 
-  static int32 MakeFakeLocation(int32 index, int32 element);
+  static int32_t MakeFakeLocation(int32_t index, int32_t element);
 
-  uint32 max_varying_vectors() const {
-    return max_varying_vectors_;
-  }
+  uint32_t max_varying_vectors() const { return max_varying_vectors_; }
 
-  uint32 max_dual_source_draw_buffers() const {
+  uint32_t max_dual_source_draw_buffers() const {
     return max_dual_source_draw_buffers_;
   }
 
  private:
   friend class Program;
 
   void StartTracking(Program* program);
   void StopTracking(Program* program);
 
   void RemoveProgramInfoIfUnused(
       ShaderManager* shader_manager, Program* program);
 
   // Info for each "successfully linked" program by service side program Id.
   // TODO(gman): Choose a faster container.
   typedef std::map<GLuint, scoped_refptr<Program> > ProgramMap;
   ProgramMap programs_;
 
   // Counts the number of Program allocated with 'this' as its manager.
   // Allows to check no Program will outlive this.
   unsigned int program_count_;
 
   bool have_context_;
 
   // Used to clear uniforms.
-  std::vector<uint8> zero_;
+  std::vector<uint8_t> zero_;
 
   ProgramCache* program_cache_;
 
-  uint32 max_varying_vectors_;
-  uint32 max_dual_source_draw_buffers_;
+  uint32_t max_varying_vectors_;
+  uint32_t max_dual_source_draw_buffers_;
 
   scoped_refptr<FeatureInfo> feature_info_;
 
   DISALLOW_COPY_AND_ASSIGN(ProgramManager);
 };
 
 inline const FeatureInfo& Program::feature_info() const {
   return *manager_->feature_info_.get();
 }
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_