Switch to standard integer types in gpu/.

gpu/command_buffer/service/gpu_tracer.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 "gpu/command_buffer/service/gpu_tracer.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <deque>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 37 matching lines @@
     : named_thread_(name.c_str()) {
   named_thread_.Start();
   named_thread_.Stop();
 }
 
 TraceOutputter::~TraceOutputter() { g_outputter_thread = NULL; }
 
 void TraceOutputter::TraceDevice(GpuTracerSource source,
                                  const std::string& category,
                                  const std::string& name,
-                                 int64 start_time,
-                                 int64 end_time) {
+                                 int64_t start_time,
+                                 int64_t end_time) {
   DCHECK(source >= 0 && source < NUM_TRACER_SOURCES);
   TRACE_EVENT_COPY_BEGIN_WITH_ID_TID_AND_TIMESTAMP2(
       TRACE_DISABLED_BY_DEFAULT("gpu.device"),
       name.c_str(),
       local_trace_device_id_,
       named_thread_.GetThreadId(),
       start_time,
       "gl_category",
       category.c_str(),
       "channel",
@@ skipping 26 matching lines @@
 
   trace_service_id_stack_[source].push(local_trace_service_id_);
   ++local_trace_service_id_;
 }
 
 void TraceOutputter::TraceServiceEnd(GpuTracerSource source,
                                      const std::string& category,
                                      const std::string& name) {
   DCHECK(source >= 0 && source < NUM_TRACER_SOURCES);
   DCHECK(!trace_service_id_stack_[source].empty());
-  const uint64 local_trace_id = trace_service_id_stack_[source].top();
+  const uint64_t local_trace_id = trace_service_id_stack_[source].top();
   trace_service_id_stack_[source].pop();
 
   TRACE_EVENT_COPY_NESTABLE_ASYNC_END_WITH_TTS2(
       TRACE_DISABLED_BY_DEFAULT("gpu.service"),
       name.c_str(), local_trace_id,
       "gl_category", category.c_str(),
       "channel", kGpuTraceSourceNames[source]);
 }
 
 GPUTrace::GPUTrace(scoped_refptr<Outputter> outputter,
@@ skipping 41 matching lines @@
 }
 
 bool GPUTrace::IsAvailable() {
   return !gpu_timer_.get() || gpu_timer_->IsAvailable();
 }
 
 void GPUTrace::Process() {
   if (gpu_timer_.get() && device_enabled_) {
     DCHECK(IsAvailable());
 
-    int64 start = 0;
-    int64 end = 0;
+    int64_t start = 0;
+    int64_t end = 0;
     gpu_timer_->GetStartEndTimestamps(&start, &end);
     outputter_->TraceDevice(source_, category_, name_, start, end);
   }
 }
 
 GPUTracer::GPUTracer(gles2::GLES2Decoder* decoder)
     : gpu_trace_srv_category(TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
           TRACE_DISABLED_BY_DEFAULT("gpu.service"))),
       gpu_trace_dev_category(TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
           TRACE_DISABLED_BY_DEFAULT("gpu.device"))),
@@ skipping 183 matching lines @@
     return markers_[source].back().name_;
   }
   return base::EmptyString();
 }
 
 scoped_refptr<Outputter> GPUTracer::CreateOutputter(const std::string& name) {
   return TraceOutputter::Create(name);
 }
 
 bool GPUTracer::CheckDisjointStatus() {
-  const int64 current_time = gpu_timing_client_->GetCurrentCPUTime();
+  const int64_t current_time = gpu_timing_client_->GetCurrentCPUTime();
   if (*gpu_trace_dev_category == 0)
     return false;
 
   bool status = gpu_timing_client_->CheckAndResetTimerErrors();
   if (status && began_device_traces_) {
     // Log disjoint event if we have active traces.
     const std::string unique_disjoint_name =
         base::StringPrintf("DisjointEvent-%p", this);
     outputter_->TraceDevice(kTraceDisjoint,
                             "DisjointEvent",
@@ skipping 17 matching lines @@
   }
 
   while (!finished_traces_.empty()) {
     finished_traces_.front()->Destroy(have_context);
     finished_traces_.pop_front();
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu