Switch to standard integer types in gpu/.

gpu/command_buffer/service/context_group.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_CONTEXT_GROUP_H_
 #define GPU_COMMAND_BUFFER_SERVICE_CONTEXT_GROUP_H_
 
+#include <stdint.h>
+
 #include <vector>
-#include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/framebuffer_completeness_cache.h"
 #include "gpu/command_buffer/service/shader_translator_cache.h"
 #include "gpu/gpu_export.h"
@@ skipping 60 matching lines @@
   }
 
   FramebufferCompletenessCache* framebuffer_completeness_cache() const {
     return framebuffer_completeness_cache_.get();
   }
 
   bool bind_generates_resource() {
     return bind_generates_resource_;
   }
 
-  uint32 max_vertex_attribs() const {
-    return max_vertex_attribs_;
-  }
+  uint32_t max_vertex_attribs() const { return max_vertex_attribs_; }
 
-  uint32 max_texture_units() const {
-    return max_texture_units_;
-  }
+  uint32_t max_texture_units() const { return max_texture_units_; }
 
-  uint32 max_texture_image_units() const {
-    return max_texture_image_units_;
-  }
+  uint32_t max_texture_image_units() const { return max_texture_image_units_; }
 
-  uint32 max_vertex_texture_image_units() const {
+  uint32_t max_vertex_texture_image_units() const {
     return max_vertex_texture_image_units_;
   }
 
-  uint32 max_fragment_uniform_vectors() const {
+  uint32_t max_fragment_uniform_vectors() const {
     return max_fragment_uniform_vectors_;
   }
 
-  uint32 max_varying_vectors() const {
-    return max_varying_vectors_;
-  }
+  uint32_t max_varying_vectors() const { return max_varying_vectors_; }
 
-  uint32 max_vertex_uniform_vectors() const {
+  uint32_t max_vertex_uniform_vectors() const {
     return max_vertex_uniform_vectors_;
   }
 
-  uint32 max_color_attachments() const {
-    return max_color_attachments_;
-  }
+  uint32_t max_color_attachments() const { return max_color_attachments_; }
 
-  uint32 max_draw_buffers() const {
-    return max_draw_buffers_;
-  }
+  uint32_t max_draw_buffers() const { return max_draw_buffers_; }
 
-  uint32 max_dual_source_draw_buffers() const {
+  uint32_t max_dual_source_draw_buffers() const {
     return max_dual_source_draw_buffers_;
   }
 
   FeatureInfo* feature_info() {
     return feature_info_.get();
   }
 
   BufferManager* buffer_manager() const {
     return buffer_manager_.get();
   }
@@ skipping 37 matching lines @@
   }
 
   TransferBufferManager* transfer_buffer_manager() const {
     return transfer_buffer_manager_.get();
   }
 
   SamplerManager* sampler_manager() const {
     return sampler_manager_.get();
   }
 
-  uint32 GetMemRepresented() const;
+  uint32_t GetMemRepresented() const;
 
   // Loses all the context associated with this group.
   void LoseContexts(error::ContextLostReason reason);
 
   bool GetBufferServiceId(GLuint client_id, GLuint* service_id) const;
 
   void AddTransformFeedbackId(GLuint client_id, GLuint service_id) {
     transformfeedbacks_id_map_[client_id] = service_id;
   }
 
@@ skipping 34 matching lines @@
 
   void RemoveSyncId(GLuint client_id) {
     syncs_id_map_.erase(client_id);
   }
 
  private:
   friend class base::RefCounted<ContextGroup>;
   ~ContextGroup();
 
   bool CheckGLFeature(GLint min_required, GLint* v);
-  bool CheckGLFeatureU(GLint min_required, uint32* v);
+  bool CheckGLFeatureU(GLint min_required, uint32_t* v);
   bool QueryGLFeature(GLenum pname, GLint min_required, GLint* v);
-  bool QueryGLFeatureU(GLenum pname, GLint min_required, uint32* v);
+  bool QueryGLFeatureU(GLenum pname, GLint min_required, uint32_t* v);
   bool HaveContexts();
 
   scoped_refptr<MailboxManager> mailbox_manager_;
   scoped_refptr<MemoryTracker> memory_tracker_;
   scoped_refptr<ShaderTranslatorCache> shader_translator_cache_;
   scoped_refptr<FramebufferCompletenessCache> framebuffer_completeness_cache_;
   scoped_refptr<TransferBufferManager> transfer_buffer_manager_;
   scoped_refptr<SubscriptionRefSet> subscription_ref_set_;
   scoped_refptr<ValueStateMap> pending_valuebuffer_state_;
 
   bool enforce_gl_minimums_;
   bool bind_generates_resource_;
 
-  uint32 max_vertex_attribs_;
-  uint32 max_texture_units_;
-  uint32 max_texture_image_units_;
-  uint32 max_vertex_texture_image_units_;
-  uint32 max_fragment_uniform_vectors_;
-  uint32 max_varying_vectors_;
-  uint32 max_vertex_uniform_vectors_;
-  uint32 max_color_attachments_;
-  uint32 max_draw_buffers_;
-  uint32 max_dual_source_draw_buffers_;
+  uint32_t max_vertex_attribs_;
+  uint32_t max_texture_units_;
+  uint32_t max_texture_image_units_;
+  uint32_t max_vertex_texture_image_units_;
+  uint32_t max_fragment_uniform_vectors_;
+  uint32_t max_varying_vectors_;
+  uint32_t max_vertex_uniform_vectors_;
+  uint32_t max_color_attachments_;
+  uint32_t max_draw_buffers_;
+  uint32_t max_dual_source_draw_buffers_;
 
   ProgramCache* program_cache_;
 
   scoped_ptr<BufferManager> buffer_manager_;
 
   scoped_ptr<FramebufferManager> framebuffer_manager_;
 
   scoped_ptr<RenderbufferManager> renderbuffer_manager_;
 
   scoped_ptr<TextureManager> texture_manager_;
@@ skipping 16 matching lines @@
   base::hash_map<GLuint, GLuint> transformfeedbacks_id_map_;
   base::hash_map<GLuint, GLsync> syncs_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ContextGroup);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_CONTEXT_GROUP_H_