Fixed GPU tracing so the categories do not get mixed.

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 <string>
 
@@ skipping 71 matching lines @@
   bool Begin(const std::string& category, const std::string& name,
              GpuTracerSource source);
 
   // End the last started trace marker.
   bool End(GpuTracerSource source);
 
   virtual bool IsTracing();
 
   // Retrieve the name of the current open trace.
   // Returns empty string if no current open trace.
-  const std::string& CurrentCategory() const;
-  const std::string& CurrentName() const;
+  const std::string& CurrentCategory(GpuTracerSource source) const;
+  const std::string& CurrentName(GpuTracerSource source) const;
 
  protected:
   // Trace Processing.
   scoped_refptr<GPUTrace> CreateTrace(const std::string& category,
                                       const std::string& name);
   virtual scoped_refptr<Outputter> CreateOutputter(const std::string& name);
   virtual scoped_refptr<CPUTime> CreateCPUTime();
   virtual GpuTracerType DetermineTracerType();
   virtual void PostTask();
 
   void Process();
   void ProcessTraces();
 
   void CalculateTimerOffset();
   void IssueProcessTask();
 
   scoped_refptr<Outputter> outputter_;
   scoped_refptr<CPUTime> cpu_time_;
   std::vector<TraceMarker> markers_[NUM_TRACER_SOURCES];
   std::deque<scoped_refptr<GPUTrace> > traces_;
 
   const unsigned char* gpu_trace_srv_category;
   const unsigned char* gpu_trace_dev_category;
   gles2::GLES2Decoder* decoder_;
 
   int64 timer_offset_;
-  GpuTracerSource last_tracer_source_;
 
   GpuTracerType tracer_type_;
   bool gpu_timing_synced_;
   bool gpu_executing_;
   bool process_posted_;
 
   DISALLOW_COPY_AND_ASSIGN(GPUTracer);
 };
 
 class Outputter : public base::RefCounted<Outputter> {
@@ skipping 48 matching lines @@
  public:
   GPUTrace(scoped_refptr<Outputter> outputter,
            scoped_refptr<CPUTime> cpu_time,
            const std::string& category,
            const std::string& name,
            int64 offset,
            GpuTracerType tracer_type);
 
   bool IsEnabled() { return tracer_type_ != kTracerTypeInvalid; }
 
-  const std::string& category() { return category_; }
-  const std::string& name() { return name_; }
-
   void Start(bool trace_service);
   void End(bool tracing_service);
   bool IsAvailable();
   void Process();
 
  private:
   ~GPUTrace();
 
   void Output();
 
@@ skipping 12 matching lines @@
 
   GLuint queries_[2];
 
   DISALLOW_COPY_AND_ASSIGN(GPUTrace);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GPU_TRACER_H_