Switch to standard integer types in ui/gfx/.

ui/gfx/mac/io_surface_manager.cc

 // Copyright 2015 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 "ui/gfx/mac/io_surface_manager.h"
 
 #include <IOSurface/IOSurface.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
+#include "base/macros.h"
 #include "ui/gfx/buffer_format_util.h"
 
 namespace gfx {
 namespace {
 
 IOSurfaceManager* g_instance = NULL;
 
 void AddIntegerValue(CFMutableDictionaryRef dictionary,
                      const CFStringRef key,
-                     int32 value) {
+                     int32_t value) {
   base::ScopedCFTypeRef<CFNumberRef> number(
       CFNumberCreate(NULL, kCFNumberSInt32Type, &value));
   CFDictionaryAddValue(dictionary, key, number.get());
 }
 
-int32 BytesPerElement(gfx::BufferFormat format, int plane) {
+int32_t BytesPerElement(gfx::BufferFormat format, int plane) {
   switch (format) {
     case gfx::BufferFormat::R_8:
       DCHECK_EQ(plane, 0);
       return 1;
     case gfx::BufferFormat::BGRA_8888:
     case gfx::BufferFormat::RGBA_8888:
       DCHECK_EQ(plane, 0);
       return 4;
     case gfx::BufferFormat::YUV_420_BIPLANAR:
-      static int32 bytes_per_element[] = {1, 2};
+      static int32_t bytes_per_element[] = {1, 2};
       DCHECK_LT(static_cast<size_t>(plane), arraysize(bytes_per_element));
       return bytes_per_element[plane];
     case gfx::BufferFormat::UYVY_422:
       DCHECK_EQ(plane, 0);
       return 2;
     case gfx::BufferFormat::ATC:
     case gfx::BufferFormat::ATCIA:
     case gfx::BufferFormat::DXT1:
     case gfx::BufferFormat::DXT5:
     case gfx::BufferFormat::ETC1:
     case gfx::BufferFormat::RGBA_4444:
     case gfx::BufferFormat::RGBX_8888:
     case gfx::BufferFormat::BGRX_8888:
     case gfx::BufferFormat::YUV_420:
       NOTREACHED();
       return 0;
   }
 
   NOTREACHED();
   return 0;
 }
 
-int32 PixelFormat(gfx::BufferFormat format) {
+int32_t PixelFormat(gfx::BufferFormat format) {
   switch (format) {
     case gfx::BufferFormat::R_8:
       return 'L008';
     case gfx::BufferFormat::BGRA_8888:
     case gfx::BufferFormat::RGBA_8888:
       return 'BGRA';
     case gfx::BufferFormat::YUV_420_BIPLANAR:
       return '420v';
     case gfx::BufferFormat::UYVY_422:
       return '2vuy';
@@ skipping 67 matching lines @@
     CFDictionaryAddValue(properties, kIOSurfacePlaneInfo, planes);
   } else {
     AddIntegerValue(properties, kIOSurfaceBytesPerElement,
                     BytesPerElement(format, 0));
   }
 
   return IOSurfaceCreate(properties);
 }
 
 }  // namespace content