Pull in various gpu/command_buffer fixes from chromium

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 <string>
@@ skipping 38 matching lines @@
   scoped_refptr<GPUTrace> trace_;
 };
 
 // Traces GPU Commands.
 class GPU_EXPORT GPUTracer
     : public base::SupportsWeakPtr<GPUTracer> {
  public:
   explicit GPUTracer(gles2::GLES2Decoder* decoder);
   virtual ~GPUTracer();
 
+  void Destroy(bool have_context);
+
   // Scheduled processing in decoder begins.
   bool BeginDecoding();
 
   // Scheduled processing in decoder ends.
   bool EndDecoding();
 
   // Begin a trace marker.
   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(GpuTracerSource source) const;
   const std::string& CurrentName(GpuTracerSource source) const;
 
  protected:
   // Trace Processing.
   virtual scoped_refptr<Outputter> CreateOutputter(const std::string& name);
   virtual void PostTask();
 
   void Process();
   void ProcessTraces();
+  void ClearFinishedTraces(bool have_context);
 
   void IssueProcessTask();
 
   scoped_refptr<gfx::GPUTimingClient> gpu_timing_client_;
   scoped_refptr<Outputter> outputter_;
   std::vector<TraceMarker> markers_[NUM_TRACER_SOURCES];
-  std::deque<scoped_refptr<GPUTrace> > traces_;
+  std::deque<scoped_refptr<GPUTrace> > finished_traces_;
 
   const unsigned char* gpu_trace_srv_category;
   const unsigned char* gpu_trace_dev_category;
   gles2::GLES2Decoder* decoder_;
 
   bool gpu_executing_;
   bool process_posted_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GPUTracer);
@@ skipping 43 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TraceOutputter);
 };
 
 class GPU_EXPORT GPUTrace
     : public base::RefCounted<GPUTrace> {
  public:
   GPUTrace(scoped_refptr<Outputter> outputter,
            gfx::GPUTimingClient* gpu_timing_client,
            const std::string& category,
            const std::string& name,
-           const bool enabled);
+           const bool tracing_service,
+           const bool tracing_device);
 
-  void Start(bool trace_service);
-  void End(bool tracing_service);
+  void Destroy(bool have_context);
+
+  void Start();
+  void End();
   bool IsAvailable();
-  bool IsEnabled() { return enabled_; }
+  bool IsServiceTraceEnabled() const { return service_enabled_; }
+  bool IsDeviceTraceEnabled() const { return device_enabled_; }
   void Process();
 
  private:
   ~GPUTrace();
 
   void Output();
 
   friend class base::RefCounted<GPUTrace>;
 
   std::string category_;
   std::string name_;
   scoped_refptr<Outputter> outputter_;
   scoped_ptr<gfx::GPUTimer> gpu_timer_;
-  const bool enabled_ = false;
+  const bool service_enabled_ = false;
+  const bool device_enabled_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(GPUTrace);
 };
 
 class ScopedGPUTrace {
  public:
   ScopedGPUTrace(GPUTracer* gpu_tracer,
                  GpuTracerSource source,
                  const std::string& category,
                  const std::string& name)
       : gpu_tracer_(gpu_tracer), source_(source) {
     gpu_tracer_->Begin(category, name, source_);
   }
 
   ~ScopedGPUTrace() { gpu_tracer_->End(source_); }
 
  private:
   GPUTracer* gpu_tracer_;
   GpuTracerSource source_;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GPU_TRACER_H_