Switch to standard integer types in gpu/.

gpu/command_buffer/service/gpu_tracer.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.
 
 // This file contains the GPUTrace class.
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GPU_TRACER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GPU_TRACER_H_
 
+#include <stdint.h>
+
 #include <deque>
 #include <stack>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/gpu_export.h"
 
 namespace gfx {
   class GPUTimingClient;
   class GPUTimer;
 }
@@ skipping 65 matching lines @@
   void ClearOngoingTraces(bool have_context);
 
   scoped_refptr<gfx::GPUTimingClient> gpu_timing_client_;
   scoped_refptr<Outputter> outputter_;
   std::vector<TraceMarker> markers_[NUM_TRACER_SOURCES];
   std::deque<scoped_refptr<GPUTrace> > finished_traces_;
 
   const unsigned char* gpu_trace_srv_category;
   const unsigned char* gpu_trace_dev_category;
   gles2::GLES2Decoder* decoder_;
-  int64 disjoint_time_ = 0;
+  int64_t disjoint_time_ = 0;
 
   bool gpu_executing_ = false;
   bool began_device_traces_ = false;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GPUTracer);
 };
 
 class Outputter : public base::RefCounted<Outputter> {
  public:
   virtual void TraceDevice(GpuTracerSource source,
                            const std::string& category,
                            const std::string& name,
-                           int64 start_time,
-                           int64 end_time) = 0;
+                           int64_t start_time,
+                           int64_t end_time) = 0;
 
   virtual void TraceServiceBegin(GpuTracerSource source,
                                  const std::string& category,
                                  const std::string& name) = 0;
 
   virtual void TraceServiceEnd(GpuTracerSource source,
                                const std::string& category,
                                const std::string& name) = 0;
 
  protected:
   virtual ~Outputter() {}
   friend class base::RefCounted<Outputter>;
 };
 
 class TraceOutputter : public Outputter {
  public:
   static scoped_refptr<TraceOutputter> Create(const std::string& name);
   void TraceDevice(GpuTracerSource source,
                    const std::string& category,
                    const std::string& name,
-                   int64 start_time,
-                   int64 end_time) override;
+                   int64_t start_time,
+                   int64_t end_time) override;
 
   void TraceServiceBegin(GpuTracerSource source,
                          const std::string& category,
                          const std::string& name) override;
 
   void TraceServiceEnd(GpuTracerSource source,
                        const std::string& category,
                        const std::string& name) override;
 
  protected:
   friend class base::RefCounted<Outputter>;
   explicit TraceOutputter(const std::string& name);
   ~TraceOutputter() override;
 
   base::Thread named_thread_;
-  uint64 local_trace_device_id_ = 0;
-  uint64 local_trace_service_id_ = 0;
+  uint64_t local_trace_device_id_ = 0;
+  uint64_t local_trace_service_id_ = 0;
 
-  std::stack<uint64> trace_service_id_stack_[NUM_TRACER_SOURCES];
+  std::stack<uint64_t> trace_service_id_stack_[NUM_TRACER_SOURCES];
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TraceOutputter);
 };
 
 class GPU_EXPORT GPUTrace
     : public base::RefCounted<GPUTrace> {
  public:
   GPUTrace(scoped_refptr<Outputter> outputter,
            gfx::GPUTimingClient* gpu_timing_client,
@@ skipping 44 matching lines @@
 
  private:
   GPUTracer* gpu_tracer_;
   GpuTracerSource source_;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GPU_TRACER_H_