Switch to standard integer types in ui/.

ui/surface/accelerated_surface_mac.h

 // 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.
 
 #ifndef UI_SURFACE_ACCELERATED_SURFACE_MAC_H_
 #define UI_SURFACE_ACCELERATED_SURFACE_MAC_H_
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOSurface/IOSurface.h>
+#include <stdint.h>
 
 #include "base/callback.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gpu_preference.h"
 #include "ui/surface/surface_export.h"
@@ skipping 34 matching lines @@
                   gfx::GpuPreference gpu_preference);
   // Tear down. Must be called before destructor to prevent leaks.
   void Destroy();
 
   // These methods are used only once the accelerated surface is initialized.
 
   // Sets the accelerated surface to the given size, creating a new one if
   // the height or width changes. Returns a unique id of the IOSurface to
   // which the surface is bound, or 0 if no changes were made or an error
   // occurred. MakeCurrent() will have been called on the new surface.
-  uint32 SetSurfaceSize(const gfx::Size& size);
+  uint32_t SetSurfaceSize(const gfx::Size& size);
 
   // Returns the id of this surface's IOSurface.
-  uint32 GetSurfaceId();
+  uint32_t GetSurfaceId();
 
   // Sets the GL context to be the current one for drawing. Returns true if
   // it succeeded.
   bool MakeCurrent();
   // Clear the surface to be transparent. Assumes the caller has already called
   // MakeCurrent().
   void Clear(const gfx::Rect& rect);
   // Call after making changes to the surface which require a visual update.
   // Makes the rendering show up in other processes. Assumes the caller has
   // already called MakeCurrent().
@@ skipping 37 matching lines @@
 
   gfx::Size ClampToValidDimensions(const gfx::Size& size);
 
   // The OpenGL context, and pbuffer drawable, used to transfer data
   // to the shared region (IOSurface).
   scoped_refptr<gfx::GLSurface> gl_surface_;
   scoped_refptr<gfx::GLContext> gl_context_;
   base::ScopedCFTypeRef<IOSurfaceRef> io_surface_;
 
   // The id of |io_surface_| or 0 if that's NULL.
-  uint32 io_surface_id_;
+  uint32_t io_surface_id_;
 
   gfx::Size surface_size_;
   // It's important to avoid allocating zero-width or zero-height
   // IOSurfaces and textures on the Mac, so we clamp each to a minimum
   // of 1. This is the real size of the surface; surface_size_ is what
   // the user requested.
   gfx::Size real_surface_size_;
   // TODO(kbr): the FBO management should not be in this class at all.
   // However, if it is factored out, care needs to be taken to not
   // introduce another copy of the color data on the GPU; the direct
   // binding of the internal texture to the IOSurface saves a copy.
   bool allocate_fbo_;
   // This texture object is always allocated, regardless of whether
   // the user requests an FBO be allocated.
   GLuint texture_;
   // The FBO and renderbuffer are only allocated if allocate_fbo_ is
   // true.
   GLuint fbo_;
 };
 
 #endif  // UI_SURFACE_ACCELERATED_SURFACE_MAC_H_