Switch to standard integer types in gpu/.

gpu/command_buffer/service/vertex_attrib_manager.cc

 // 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.
 
 #include "gpu/command_buffer/service/vertex_attrib_manager.h"
 
+#include <stdint.h>
+
 #include <list>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
 #define GLES2_GPU_SERVICE 1
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
@@ skipping 60 matching lines @@
   if (!buffer_.get() || buffer_->IsDeleted()) {
     return false;
   }
 
   // The number of elements that can be accessed.
   GLsizeiptr buffer_size = buffer_->size();
   if (offset_ > buffer_size || real_stride_ == 0) {
     return false;
   }
 
-  uint32 usable_size = buffer_size - offset_;
+  uint32_t usable_size = buffer_size - offset_;
   GLuint num_elements = usable_size / real_stride_ +
       ((usable_size % real_stride_) >=
        (GLES2Util::GetGLTypeSizeForTexturesAndBuffers(type_) * size_) ? 1 : 0);
   return index < num_elements;
 }
 
 VertexAttribManager::VertexAttribManager()
     : num_fixed_attribs_(0),
       element_array_buffer_(NULL),
       manager_(NULL),
       deleted_(false),
       service_id_(0) {
 }
 
-VertexAttribManager::VertexAttribManager(
-    VertexArrayManager* manager, GLuint service_id, uint32 num_vertex_attribs)
+VertexAttribManager::VertexAttribManager(VertexArrayManager* manager,
+                                         GLuint service_id,
+                                         uint32_t num_vertex_attribs)
     : num_fixed_attribs_(0),
       element_array_buffer_(NULL),
       manager_(manager),
       deleted_(false),
       service_id_(service_id) {
   manager_->StartTracking(this);
   Initialize(num_vertex_attribs, false);
 }
 
 VertexAttribManager::~VertexAttribManager() {
   if (manager_) {
     if (manager_->have_context_) {
       if (service_id_ != 0)  // 0 indicates an emulated VAO
         glDeleteVertexArraysOES(1, &service_id_);
     }
     manager_->StopTracking(this);
     manager_ = NULL;
   }
 }
 
-void VertexAttribManager::Initialize(
-    uint32 max_vertex_attribs, bool init_attribs) {
+void VertexAttribManager::Initialize(uint32_t max_vertex_attribs,
+                                     bool init_attribs) {
   vertex_attribs_.resize(max_vertex_attribs);
 
-  for (uint32 vv = 0; vv < vertex_attribs_.size(); ++vv) {
+  for (uint32_t vv = 0; vv < vertex_attribs_.size(); ++vv) {
     vertex_attribs_[vv].set_index(vv);
     vertex_attribs_[vv].SetList(&disabled_vertex_attribs_);
 
     if (init_attribs) {
       glVertexAttrib4f(vv, 0.0f, 0.0f, 0.0f, 1.0f);
     }
   }
 }
 
 void VertexAttribManager::SetElementArrayBuffer(Buffer* buffer) {
   element_array_buffer_ = buffer;
 }
 
 bool VertexAttribManager::Enable(GLuint index, bool enable) {
   if (index >= vertex_attribs_.size()) {
     return false;
   }
   VertexAttrib& info = vertex_attribs_[index];
   if (info.enabled() != enable) {
     info.set_enabled(enable);
     info.SetList(enable ? &enabled_vertex_attribs_ : &disabled_vertex_attribs_);
   }
   return true;
 }
 
 void VertexAttribManager::Unbind(Buffer* buffer) {
   if (element_array_buffer_.get() == buffer) {
     element_array_buffer_ = NULL;
   }
-  for (uint32 vv = 0; vv < vertex_attribs_.size(); ++vv) {
+  for (uint32_t vv = 0; vv < vertex_attribs_.size(); ++vv) {
     vertex_attribs_[vv].Unbind(buffer);
   }
 }
 
 bool VertexAttribManager::ValidateBindings(
     const char* function_name,
     GLES2Decoder* decoder,
     FeatureInfo* feature_info,
     Program* current_program,
     GLuint max_vertex_accessed,
@@ skipping 103 matching lines @@
   if (current_buffer_id != kInitialBufferId) {
     // Restore the buffer binding.
     decoder->RestoreBufferBindings();
   }
 
   return true;
 }
 
 }  // namespace gles2
 }  // namespace gpu