Switch to standard integer types in gpu/.

gpu/command_buffer/service/context_group.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/context_group.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
 #include "gpu/command_buffer/common/value_state.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/command_buffer/service/mailbox_manager_impl.h"
 #include "gpu/command_buffer/service/path_manager.h"
@@ skipping 60 matching lines @@
     if (!subscription_ref_set_.get())
       subscription_ref_set_ = new SubscriptionRefSet();
     if (!pending_valuebuffer_state_.get())
       pending_valuebuffer_state_ = new ValueStateMap();
     if (!feature_info.get())
       feature_info_ = new FeatureInfo;
     transfer_buffer_manager_ = new TransferBufferManager(memory_tracker_.get());
   }
 }
 
-static void GetIntegerv(GLenum pname, uint32* var) {
+static void GetIntegerv(GLenum pname, uint32_t* var) {
   GLint value = 0;
   glGetIntegerv(pname, &value);
   *var = value;
 }
 
 bool ContextGroup::Initialize(GLES2Decoder* decoder,
                               ContextType context_type,
                               const DisallowedFeatures& disallowed_features) {
   if (HaveContexts()) {
     if (context_type != feature_info_->context_type()) {
@@ skipping 171 matching lines @@
     LOG(ERROR) << "ContextGroup::Initialize failed because too few "
                << "uniforms or varyings supported.";
     return false;
   }
 
   // Some shaders in Skia need more than the min available vertex and
   // fragment shader uniform vectors in case of OSMesa GL Implementation
   if (feature_info_->workarounds().max_fragment_uniform_vectors) {
     max_fragment_uniform_vectors_ = std::min(
         max_fragment_uniform_vectors_,
-        static_cast<uint32>(
+        static_cast<uint32_t>(
             feature_info_->workarounds().max_fragment_uniform_vectors));
   }
   if (feature_info_->workarounds().max_varying_vectors) {
-    max_varying_vectors_ = std::min(
-        max_varying_vectors_,
-        static_cast<uint32>(feature_info_->workarounds().max_varying_vectors));
+    max_varying_vectors_ =
+        std::min(max_varying_vectors_,
+                 static_cast<uint32_t>(
+                     feature_info_->workarounds().max_varying_vectors));
   }
   if (feature_info_->workarounds().max_vertex_uniform_vectors) {
     max_vertex_uniform_vectors_ =
         std::min(max_vertex_uniform_vectors_,
-                 static_cast<uint32>(
+                 static_cast<uint32_t>(
                      feature_info_->workarounds().max_vertex_uniform_vectors));
   }
 
   path_manager_.reset(new PathManager());
 
   program_manager_.reset(
       new ProgramManager(program_cache_, max_varying_vectors_,
                          max_dual_source_draw_buffers_, feature_info_.get()));
 
   if (!texture_manager_->Initialize()) {
@@ skipping 85 matching lines @@
   }
 
   if (valuebuffer_manager_ != NULL) {
     valuebuffer_manager_->Destroy();
     valuebuffer_manager_.reset();
   }
 
   memory_tracker_ = NULL;
 }
 
-uint32 ContextGroup::GetMemRepresented() const {
-  uint32 total = 0;
+uint32_t ContextGroup::GetMemRepresented() const {
+  uint32_t total = 0;
   if (buffer_manager_.get())
     total += buffer_manager_->mem_represented();
   if (renderbuffer_manager_.get())
     total += renderbuffer_manager_->mem_represented();
   if (texture_manager_.get())
     total += texture_manager_->mem_represented();
   return total;
 }
 
 void ContextGroup::LoseContexts(error::ContextLostReason reason) {
@@ skipping 10 matching lines @@
 
 bool ContextGroup::CheckGLFeature(GLint min_required, GLint* v) {
   GLint value = *v;
   if (enforce_gl_minimums_) {
     value = std::min(min_required, value);
   }
   *v = value;
   return value >= min_required;
 }
 
-bool ContextGroup::CheckGLFeatureU(GLint min_required, uint32* v) {
+bool ContextGroup::CheckGLFeatureU(GLint min_required, uint32_t* v) {
   GLint value = *v;
   if (enforce_gl_minimums_) {
     value = std::min(min_required, value);
   }
   *v = value;
   return value >= min_required;
 }
 
 bool ContextGroup::QueryGLFeature(
     GLenum pname, GLint min_required, GLint* v) {
   GLint value = 0;
   glGetIntegerv(pname, &value);
   *v = value;
   return CheckGLFeature(min_required, v);
 }
 
-bool ContextGroup::QueryGLFeatureU(
-    GLenum pname, GLint min_required, uint32* v) {
-  uint32 value = 0;
+bool ContextGroup::QueryGLFeatureU(GLenum pname,
+                                   GLint min_required,
+                                   uint32_t* v) {
+  uint32_t value = 0;
   GetIntegerv(pname, &value);
   bool result = CheckGLFeatureU(min_required, &value);
   *v = value;
   return result;
 }
 
 bool ContextGroup::GetBufferServiceId(
     GLuint client_id, GLuint* service_id) const {
   Buffer* buffer = buffer_manager_->GetBuffer(client_id);
   if (!buffer)
     return false;
   *service_id = buffer->service_id();
   return true;
 }
 
 }  // namespace gles2
 }  // namespace gpu