Remove command_buffer/common/types.h.

gpu/command_buffer/common/gles2_cmd_utils_unittest.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/common/gles2_cmd_utils.h"
 
 #include <limits>
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gpu {
 namespace gles2 {
 
 class GLES2UtilTest : public testing:: Test {
  protected:
   GLES2Util util_;
 };
 
 TEST_F(GLES2UtilTest, SafeMultiplyUint32) {
-  uint32 result = 0;
+  uint32_t result = 0;
   EXPECT_TRUE(SafeMultiplyUint32(2u, 3u, &result));
   EXPECT_EQ(6u, result);
   EXPECT_FALSE(SafeMultiplyUint32(0x80000000u, 2u, &result));
   EXPECT_EQ(0u, result);
   EXPECT_TRUE(SafeMultiplyUint32(0x2u, 0x7FFFFFFFu, &result));
   EXPECT_EQ(0xFFFFFFFEu, result);
   EXPECT_FALSE(SafeMultiplyUint32(2u, 0x80000000u, &result));
   EXPECT_EQ(0u, result);
 }
 
 TEST_F(GLES2UtilTest, SafeAddUint32) {
-  uint32 result = 0;
+  uint32_t result = 0;
   EXPECT_TRUE(SafeAddUint32(2u, 3u, &result));
   EXPECT_EQ(5u, result);
   EXPECT_FALSE(SafeAddUint32(0x80000000u, 0x80000000u, &result));
   EXPECT_EQ(0u, result);
   EXPECT_TRUE(SafeAddUint32(0xFFFFFFFEu, 0x1u, &result));
   EXPECT_EQ(0xFFFFFFFFu, result);
   EXPECT_FALSE(SafeAddUint32(0xFFFFFFFEu, 0x2u, &result));
   EXPECT_EQ(0u, result);
   EXPECT_TRUE(SafeAddUint32(0x1u, 0xFFFFFFFEu, &result));
   EXPECT_EQ(0xFFFFFFFFu, result);
   EXPECT_FALSE(SafeAddUint32(0x2u, 0xFFFFFFFEu, &result));
   EXPECT_EQ(0u, result);
 }
 
 TEST_F(GLES2UtilTest, SafeAddInt32) {
-  int32 result = 0;
-  const int32 kMax = std::numeric_limits<int32>::max();
-  const int32 kMin = std::numeric_limits<int32>::min();
+  int32_t result = 0;
+  const int32_t kMax = std::numeric_limits<int32_t>::max();
+  const int32_t kMin = std::numeric_limits<int32_t>::min();
   EXPECT_TRUE(SafeAddInt32(2, 3, &result));
   EXPECT_EQ(5, result);
   EXPECT_FALSE(SafeAddInt32(kMax, 1, &result));
   EXPECT_EQ(0, result);
   EXPECT_TRUE(SafeAddInt32(kMin + 1, -1, &result));
   EXPECT_EQ(kMin, result);
   EXPECT_FALSE(SafeAddInt32(kMin, -1, &result));
   EXPECT_EQ(0, result);
   EXPECT_TRUE(SafeAddInt32(kMax - 1, 1, &result));
   EXPECT_EQ(kMax, result);
@@ skipping 18 matching lines @@
   util_.set_num_shader_binary_formats(2);
 
   EXPECT_EQ(1, util_.GLGetNumValuesReturned(GL_COMPRESSED_TEXTURE_FORMATS));
   EXPECT_EQ(2, util_.GLGetNumValuesReturned(GL_SHADER_BINARY_FORMATS));
 
   EXPECT_EQ(1, util_.num_compressed_texture_formats());
   EXPECT_EQ(2, util_.num_shader_binary_formats());
 }
 
 TEST_F(GLES2UtilTest, ComputeImageDataSizesFormats) {
-  const uint32 kWidth = 16;
-  const uint32 kHeight = 12;
-  uint32 size;
-  uint32 unpadded_row_size;
-  uint32 padded_row_size;
+  const uint32_t kWidth = 16;
+  const uint32_t kHeight = 12;
+  uint32_t size;
+  uint32_t unpadded_row_size;
+  uint32_t padded_row_size;
   EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
       kWidth, kHeight, GL_RGB, GL_UNSIGNED_BYTE, 1, &size, &unpadded_row_size,
       &padded_row_size));
   EXPECT_EQ(kWidth * kHeight * 3, size);
   EXPECT_EQ(kWidth * 3, padded_row_size);
   EXPECT_EQ(padded_row_size, unpadded_row_size);
   EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
       kWidth, kHeight, GL_RGBA, GL_UNSIGNED_BYTE, 1, &size, &unpadded_row_size,
       &padded_row_size));
   EXPECT_EQ(kWidth * kHeight * 4, size);
@@ skipping 32 matching lines @@
   EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
       kWidth, kHeight, GL_DEPTH_STENCIL_OES, GL_UNSIGNED_INT_24_8_OES, 1,
       &size, &unpadded_row_size,
       &padded_row_size));
   EXPECT_EQ(kWidth * kHeight * 4, size);
   EXPECT_EQ(kWidth * 4, padded_row_size);
   EXPECT_EQ(padded_row_size, unpadded_row_size);
 }
 
 TEST_F(GLES2UtilTest, ComputeImageDataSizeTypes) {
-  const uint32 kWidth = 16;
-  const uint32 kHeight = 12;
-  uint32 size;
-  uint32 unpadded_row_size;
-  uint32 padded_row_size;
+  const uint32_t kWidth = 16;
+  const uint32_t kHeight = 12;
+  uint32_t size;
+  uint32_t unpadded_row_size;
+  uint32_t padded_row_size;
   EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
       kWidth, kHeight, GL_RGBA, GL_UNSIGNED_BYTE, 1, &size, &unpadded_row_size,
       &padded_row_size));
   EXPECT_EQ(kWidth * kHeight * 4, size);
   EXPECT_EQ(kWidth * 4, padded_row_size);
   EXPECT_EQ(padded_row_size, unpadded_row_size);
   EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
       kWidth, kHeight, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, 1, &size,
       &unpadded_row_size, &padded_row_size));
   EXPECT_EQ(kWidth * kHeight * 2, size);
@@ skipping 13 matching lines @@
   EXPECT_EQ(padded_row_size, unpadded_row_size);
   EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
       kWidth, kHeight, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 1, &size,
       &unpadded_row_size, &padded_row_size));
   EXPECT_EQ(kWidth * kHeight * 4, size);
   EXPECT_EQ(kWidth * 4, padded_row_size);
   EXPECT_EQ(padded_row_size, unpadded_row_size);
 }
 
 TEST_F(GLES2UtilTest, ComputeImageDataSizesUnpackAlignment) {
-  const uint32 kWidth = 19;
-  const uint32 kHeight = 12;
-  uint32 size;
-  uint32 unpadded_row_size;
-  uint32 padded_row_size;
+  const uint32_t kWidth = 19;
+  const uint32_t kHeight = 12;
+  uint32_t size;
+  uint32_t unpadded_row_size;
+  uint32_t padded_row_size;
   EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
       kWidth, kHeight, GL_RGB, GL_UNSIGNED_BYTE, 1, &size, &unpadded_row_size,
       &padded_row_size));
   EXPECT_EQ(kWidth * kHeight * 3, size);
   EXPECT_EQ(kWidth * 3, unpadded_row_size);
   EXPECT_EQ(kWidth * 3, padded_row_size);
   EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
       kWidth, kHeight, GL_RGB, GL_UNSIGNED_BYTE, 2, &size, &unpadded_row_size,
       &padded_row_size));
   EXPECT_EQ((kWidth * 3 + 1) * (kHeight - 1) +
@@ skipping 95 matching lines @@
   CheckParseUniformName("u_name[020]", true, 6u, 20, true);
   CheckParseUniformName("u_name[0][0]", true, 9u, 0, true);
   CheckParseUniformName("u_name[3][2]", true, 9u, 2, true);
   CheckParseUniformName("u_name[03][02]", true, 10u, 2, true);
   CheckParseUniformName("u_name[30][20]", true, 10u, 20, true);
   CheckParseUniformName("u_name[030][020]", true, 11u, 20, true);
 }
 
 }  // namespace gles2
 }  // namespace gpu