Switch to standard integer types in gpu/.

gpu/command_buffer/tests/gl_texture_mailbox_unittest.cc

 // Copyright 2014 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 <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/tests/gl_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_share_group.h"
 
 namespace gpu {
 
 namespace {
-uint32 ReadTexel(GLuint id, GLint x, GLint y) {
+uint32_t ReadTexel(GLuint id, GLint x, GLint y) {
   GLint old_fbo = 0;
   glGetIntegerv(GL_FRAMEBUFFER_BINDING, &old_fbo);
 
   GLuint fbo;
   glGenFramebuffers(1, &fbo);
   glBindFramebuffer(GL_FRAMEBUFFER, fbo);
   glFramebufferTexture2D(GL_FRAMEBUFFER,
                          GL_COLOR_ATTACHMENT0,
                          GL_TEXTURE_2D,
                          id,
                          0);
   // Some drivers (NVidia/SGX) require texture settings to be a certain way or
   // they won't report FRAMEBUFFER_COMPLETE.
   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             glCheckFramebufferStatus(GL_FRAMEBUFFER));
 
-  uint32 texel = 0;
+  uint32_t texel = 0;
   glReadPixels(x, y, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &texel);
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
 
   glBindFramebuffer(GL_FRAMEBUFFER, old_fbo);
 
   glDeleteFramebuffers(1, &fbo);
 
   return texel;
 }
 }
@@ skipping 22 matching lines @@
   GLbyte mailbox1[GL_MAILBOX_SIZE_CHROMIUM];
   glGenMailboxCHROMIUM(mailbox1);
 
   GLbyte mailbox2[GL_MAILBOX_SIZE_CHROMIUM];
   glGenMailboxCHROMIUM(mailbox2);
 
   GLuint tex1;
   glGenTextures(1, &tex1);
 
   glBindTexture(GL_TEXTURE_2D, tex1);
-  uint32 source_pixel = 0xFF0000FF;
+  uint32_t source_pixel = 0xFF0000FF;
   glTexImage2D(GL_TEXTURE_2D,
                0,
                GL_RGBA,
                1, 1,
                0,
                GL_RGBA,
                GL_UNSIGNED_BYTE,
                &source_pixel);
 
   glProduceTextureCHROMIUM(GL_TEXTURE_2D, mailbox1);
@@ skipping 23 matching lines @@
   GLbyte mailbox1[GL_MAILBOX_SIZE_CHROMIUM];
   glGenMailboxCHROMIUM(mailbox1);
 
   GLbyte mailbox2[GL_MAILBOX_SIZE_CHROMIUM];
   glGenMailboxCHROMIUM(mailbox2);
 
   GLuint tex1;
   glGenTextures(1, &tex1);
 
   glBindTexture(GL_TEXTURE_2D, tex1);
-  uint32 source_pixel = 0xFF000000;
+  uint32_t source_pixel = 0xFF000000;
   glTexImage2D(GL_TEXTURE_2D,
                0,
                GL_RGB,
                1, 1,
                0,
                GL_RGB,
                GL_UNSIGNED_BYTE,
                &source_pixel);
 
   glProduceTextureCHROMIUM(GL_TEXTURE_2D, mailbox1);
@@ skipping 23 matching lines @@
   GLbyte mailbox1[GL_MAILBOX_SIZE_CHROMIUM];
   glGenMailboxCHROMIUM(mailbox1);
 
   GLbyte mailbox2[GL_MAILBOX_SIZE_CHROMIUM];
   glGenMailboxCHROMIUM(mailbox2);
 
   GLuint tex1;
   glGenTextures(1, &tex1);
 
   glBindTexture(GL_TEXTURE_2D, tex1);
-  uint32 source_pixel = 0xFF0000FF;
+  uint32_t source_pixel = 0xFF0000FF;
   glTexImage2D(GL_TEXTURE_2D,
                0,
                GL_RGBA,
                1, 1,
                0,
                GL_RGBA,
                GL_UNSIGNED_BYTE,
                &source_pixel);
 
   glProduceTextureDirectCHROMIUM(tex1, GL_TEXTURE_2D, mailbox1);
@@ skipping 12 matching lines @@
   GLuint tex3 = glCreateAndConsumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox2);
   glBindTexture(GL_TEXTURE_2D, tex3);
   EXPECT_EQ(source_pixel, ReadTexel(tex3, 0, 0));
 }
 
 TEST_F(GLTextureMailboxTest, ConsumeTextureValidatesKey) {
   GLuint tex;
   glGenTextures(1, &tex);
 
   glBindTexture(GL_TEXTURE_2D, tex);
-  uint32 source_pixel = 0xFF0000FF;
+  uint32_t source_pixel = 0xFF0000FF;
   glTexImage2D(GL_TEXTURE_2D,
                0,
                GL_RGBA,
                1, 1,
                0,
                GL_RGBA,
                GL_UNSIGNED_BYTE,
                &source_pixel);
 
   GLbyte invalid_mailbox[GL_MAILBOX_SIZE_CHROMIUM];
   glGenMailboxCHROMIUM(invalid_mailbox);
 
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
   glConsumeTextureCHROMIUM(GL_TEXTURE_2D, invalid_mailbox);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
 
   // Ensure level 0 is still intact after glConsumeTextureCHROMIUM fails.
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
   EXPECT_EQ(source_pixel, ReadTexel(tex, 0, 0));
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
 }
 
 TEST_F(GLTextureMailboxTest, SharedTextures) {
   gl1_.MakeCurrent();
   GLuint tex1;
   glGenTextures(1, &tex1);
 
   glBindTexture(GL_TEXTURE_2D, tex1);
-  uint32 source_pixel = 0xFF0000FF;
+  uint32_t source_pixel = 0xFF0000FF;
   glTexImage2D(GL_TEXTURE_2D,
                0,
                GL_RGBA,
                1, 1,
                0,
                GL_RGBA,
                GL_UNSIGNED_BYTE,
                &source_pixel);
   GLbyte mailbox[GL_MAILBOX_SIZE_CHROMIUM];
   glGenMailboxCHROMIUM(mailbox);
@@ skipping 130 matching lines @@
 TEST_F(GLTextureMailboxTest, ProduceTextureDirectInvalidTarget) {
   gl1_.MakeCurrent();
 
   GLbyte mailbox1[GL_MAILBOX_SIZE_CHROMIUM];
   glGenMailboxCHROMIUM(mailbox1);
 
   GLuint tex1;
   glGenTextures(1, &tex1);
 
   glBindTexture(GL_TEXTURE_CUBE_MAP, tex1);
-  uint32 source_pixel = 0xFF0000FF;
+  uint32_t source_pixel = 0xFF0000FF;
   glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X,
                0,
                GL_RGBA,
                1, 1,
                0,
                GL_RGBA,
                GL_UNSIGNED_BYTE,
                &source_pixel);
 
   glProduceTextureDirectCHROMIUM(tex1, GL_TEXTURE_2D, mailbox1);
@@ skipping 47 matching lines @@
     other_gl[i].Destroy();
   }
 
   gl1_.MakeCurrent();
   glDeleteTextures(2, tex);
 }
 #endif
 
 }  // namespace gpu