Fix some issues with the GPU Tracer.

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 <deque>
+#include <stack>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.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"
 
@@ skipping 122 matching lines @@
   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;
+
+  std::stack<uint64> 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_