Switch to standard integer types in content/renderer/.

content/renderer/gpu/mailbox_output_surface.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 "content/renderer/gpu/mailbox_output_surface.h"
 
 #include "base/logging.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/gl_frame_data.h"
 #include "cc/resources/resource_provider.h"
 #include "content/renderer/gpu/frame_swap_message_queue.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 
 using cc::CompositorFrame;
 using cc::GLFrameData;
 using cc::ResourceProvider;
 using gpu::Mailbox;
 using gpu::gles2::GLES2Interface;
 
 namespace content {
 
 MailboxOutputSurface::MailboxOutputSurface(
-    int32 routing_id,
-    uint32 output_surface_id,
+    int32_t routing_id,
+    uint32_t output_surface_id,
     const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
     const scoped_refptr<ContextProviderCommandBuffer>& worker_context_provider,
     scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue,
     cc::ResourceFormat format)
     : CompositorOutputSurface(routing_id,
                               output_surface_id,
                               context_provider,
                               worker_context_provider,
                               nullptr,
                               swap_frame_message_queue,
@@ skipping 107 matching lines @@
   if (!fbo_)
     gl->GenFramebuffers(1, &fbo_);
   gl->BindFramebuffer(GL_FRAMEBUFFER, fbo_);
   gl->FramebufferTexture2D(GL_FRAMEBUFFER,
                            GL_COLOR_ATTACHMENT0,
                            GL_TEXTURE_2D,
                            current_backing_.texture_id,
                            0);
 }
 
-void MailboxOutputSurface::OnSwapAck(uint32 output_surface_id,
+void MailboxOutputSurface::OnSwapAck(uint32_t output_surface_id,
                                      const cc::CompositorFrameAck& ack) {
   // Ignore message if it's a stale one coming from a different output surface
   // (e.g. after a lost context).
   if (output_surface_id != output_surface_id_) {
     CompositorOutputSurface::OnSwapAck(output_surface_id, ack);
     return;
   }
   if (!ack.gl_frame_data->mailbox.IsZero()) {
     DCHECK(!ack.gl_frame_data->size.IsEmpty());
     // The browser could be returning the oldest or any other pending texture
@@ skipping 16 matching lines @@
     } else {
       context_provider_->ContextGL()->DeleteTextures(1, &it->texture_id);
     }
 
     pending_textures_.erase(it);
   } else {
     DCHECK(!pending_textures_.empty());
     // The browser always keeps one texture as the frontbuffer.
     // If it does not return a mailbox, it discarded the frontbuffer which is
     // the oldest texture we sent.
-    uint32 texture_id = pending_textures_.front().texture_id;
+    uint32_t texture_id = pending_textures_.front().texture_id;
     if (texture_id)
       context_provider_->ContextGL()->DeleteTextures(1, &texture_id);
     pending_textures_.pop_front();
   }
   CompositorOutputSurface::OnSwapAck(output_surface_id, ack);
 }
 
 void MailboxOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
   DCHECK(frame->gl_frame_data);
   DCHECK(!surface_size_.IsEmpty());
@@ skipping 14 matching lines @@
 }
 
 size_t MailboxOutputSurface::GetNumAcksPending() {
   DCHECK(pending_textures_.size());
   return pending_textures_.size() - 1;
 }
 
 MailboxOutputSurface::TransferableFrame::TransferableFrame() : texture_id(0) {}
 
 MailboxOutputSurface::TransferableFrame::TransferableFrame(
-    uint32 texture_id,
+    uint32_t texture_id,
     const gpu::Mailbox& mailbox,
     const gfx::Size size)
     : texture_id(texture_id), mailbox(mailbox), size(size) {}
 
 }  // namespace content