Switch to standard integer types in content/renderer/.

content/renderer/gpu/compositor_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/compositor_output_surface.h"
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
+#include "build/build_config.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/managed_memory_policy.h"
 #include "cc/output/output_surface_client.h"
 #include "content/common/gpu/client/command_buffer_proxy_impl.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/renderer/gpu/frame_swap_message_queue.h"
 #include "content/renderer/render_thread_impl.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "ipc/ipc_sync_channel.h"
 
 namespace content {
 
 CompositorOutputSurface::CompositorOutputSurface(
-    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_ptr<cc::SoftwareOutputDevice> software_device,
     scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue,
     bool use_swap_compositor_frame_message)
     : OutputSurface(context_provider,
                     worker_context_provider,
                     software_device.Pass()),
       output_surface_id_(output_surface_id),
       use_swap_compositor_frame_message_(use_swap_compositor_frame_message),
-      output_surface_filter_(
-          RenderThreadImpl::current()->compositor_message_filter()),
+      output_surface_filter_(RenderThreadImpl::current()
+                                 ->compositor_message_filter()),
       frame_swap_message_queue_(swap_frame_message_queue),
       routing_id_(routing_id),
 #if defined(OS_ANDROID)
       prefers_smoothness_(false),
       main_thread_runner_(base::MessageLoop::current()->task_runner()),
 #endif
       layout_test_mode_(RenderThreadImpl::current()->layout_test_mode()),
       weak_ptrs_(this) {
   DCHECK(output_surface_filter_.get());
   DCHECK(frame_swap_message_queue_.get());
@@ skipping 32 matching lines @@
     return;
   UpdateSmoothnessTakesPriority(false);
   if (output_surface_proxy_.get())
     output_surface_proxy_->ClearOutputSurface();
   output_surface_filter_->RemoveHandlerOnCompositorThread(
       routing_id_, output_surface_filter_handler_);
   cc::OutputSurface::DetachFromClient();
 }
 
 void CompositorOutputSurface::ShortcutSwapAck(
-    uint32 output_surface_id,
+    uint32_t output_surface_id,
     scoped_ptr<cc::GLFrameData> gl_frame_data) {
   if (!layout_test_previous_frame_ack_) {
     layout_test_previous_frame_ack_.reset(new cc::CompositorFrameAck);
     layout_test_previous_frame_ack_->gl_frame_data.reset(new cc::GLFrameData);
   }
 
   OnSwapAck(output_surface_id, *layout_test_previous_frame_ack_);
 
   layout_test_previous_frame_ack_->gl_frame_data = gl_frame_data.Pass();
 }
@@ skipping 62 matching lines @@
   IPC_END_MESSAGE_MAP()
 }
 
 void CompositorOutputSurface::OnUpdateVSyncParametersFromBrowser(
     base::TimeTicks timebase,
     base::TimeDelta interval) {
   DCHECK(client_thread_checker_.CalledOnValidThread());
   CommitVSyncParameters(timebase, interval);
 }
 
-void CompositorOutputSurface::OnSwapAck(uint32 output_surface_id,
+void CompositorOutputSurface::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_)
     return;
   ReclaimResources(&ack);
   client_->DidSwapBuffersComplete();
 }
 
 void CompositorOutputSurface::OnReclaimResources(
-    uint32 output_surface_id,
+    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_)
     return;
   ReclaimResources(&ack);
 }
 
 bool CompositorOutputSurface::Send(IPC::Message* message) {
   return message_sender_->Send(message);
@@ skipping 21 matching lines @@
     main_thread_runner_->PostTask(FROM_HERE,
                                   base::Bind(&SetThreadPriorityToIdle));
   } else {
     main_thread_runner_->PostTask(FROM_HERE,
                                   base::Bind(&SetThreadPriorityToDefault));
   }
 #endif
 }
 
 }  // namespace content