Switch to standard integer types in gpu/.

gpu/command_buffer/service/texture_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/texture_manager.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <set>
 #include <utility>
 
 #include "base/bits.h"
 #include "base/lazy_instance.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
@@ skipping 567 matching lines @@
       target_ == GL_TEXTURE_RECTANGLE_ARB) {
     return false;
   }
 
   if (static_cast<size_t>(base_level_) >= face_infos_[0].level_infos.size()) {
     return false;
   }
 
   // Can't generate mips for depth or stencil textures.
   const Texture::LevelInfo& base = face_infos_[0].level_infos[base_level_];
-  uint32 channels = GLES2Util::GetChannelsForFormat(base.format);
+  uint32_t channels = GLES2Util::GetChannelsForFormat(base.format);
   if (channels & (GLES2Util::kDepth | GLES2Util::kStencil)) {
     return false;
   }
 
   // TODO(gman): Check internal_format, format and type.
   for (size_t ii = 0; ii < face_infos_.size(); ++ii) {
     const LevelInfo& info = face_infos_[ii].level_infos[base_level_];
     if ((info.target == 0) || (info.width != base.width) ||
         (info.height != base.height) || (info.depth != base.depth) ||
         (info.format != base.format) ||
@@ skipping 292 matching lines @@
     GLint xoffset,
     GLint yoffset,
     GLint zoffset,
     GLsizei width,
     GLsizei height,
     GLsizei depth) const {
   size_t face_index = GLES2Util::GLTargetToFaceIndex(target);
   if (level >= 0 && face_index < face_infos_.size() &&
       static_cast<size_t>(level) < face_infos_[face_index].level_infos.size()) {
     const LevelInfo& info = face_infos_[face_index].level_infos[level];
-    int32 max_x;
-    int32 max_y;
-    int32 max_z;
+    int32_t max_x;
+    int32_t max_y;
+    int32_t max_z;
     return SafeAddInt32(xoffset, width, &max_x) &&
            SafeAddInt32(yoffset, height, &max_y) &&
            SafeAddInt32(zoffset, depth, &max_z) &&
            xoffset >= 0 &&
            yoffset >= 0 &&
            zoffset >= 0 &&
            max_x <= info.width &&
            max_y <= info.height &&
            max_z <= info.depth;
   }
@@ skipping 542 matching lines @@
         this, "gpu::TextureManager", base::ThreadTaskRunnerHandle::Get());
   }
 
   return true;
 }
 
 scoped_refptr<TextureRef>
     TextureManager::CreateDefaultAndBlackTextures(
         GLenum target,
         GLuint* black_texture) {
-  static uint8 black[] = {0, 0, 0, 255};
+  static uint8_t black[] = {0, 0, 0, 255};
 
   // Sampling a texture not associated with any EGLImage sibling will return
   // black values according to the spec.
   bool needs_initialization = (target != GL_TEXTURE_EXTERNAL_OES);
   bool needs_faces = (target == GL_TEXTURE_CUBE_MAP);
   bool is_3d_or_2d_array_target = (target == GL_TEXTURE_3D ||
       target == GL_TEXTURE_2D_ARRAY);
 
   // Make default textures and texture for replacing non-renderable textures.
   GLuint ids[2];
@@ skipping 362 matching lines @@
   // For TexSubImage calls, internal_format isn't part of the parameters,
   // so its validation needs to be after the internal_format/format/type
   // combination validation. Otherwise, an unexpected INVALID_ENUM could be
   // generated instead of INVALID_OPERATION.
   if (!validators->texture_internal_format.IsValid(internal_format)) {
     ERRORSTATE_SET_GL_ERROR_INVALID_ENUM(
         error_state, function_name, internal_format, "internal_format");
     return false;
   }
   if (!feature_info_->IsES3Enabled()) {
-    uint32 channels = GLES2Util::GetChannelsForFormat(format);
+    uint32_t channels = GLES2Util::GetChannelsForFormat(format);
     if ((channels & (GLES2Util::kDepth | GLES2Util::kStencil)) != 0 && level) {
       ERRORSTATE_SET_GL_ERROR(
           error_state, GL_INVALID_OPERATION, function_name,
           (std::string("invalid format ") + GLES2Util::GetStringEnum(format) +
            " for level != 0").c_str());
       return false;
     }
   }
   return true;
 }
@@ skipping 745 matching lines @@
       return GL_HALF_FLOAT_OES;
     case GL_BGRA8_EXT:
       return GL_UNSIGNED_BYTE;
     default:
       return GL_NONE;
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu