Added disjoint context class which manages disjoints within gpu timing.

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 31 matching lines @@
 
   std::string category_;
   std::string name_;
   scoped_refptr<GPUTrace> trace_;
 };
 
 // Traces GPU Commands.
 class GPU_EXPORT GPUTracer
     : public base::SupportsWeakPtr<GPUTracer> {
  public:
-  explicit GPUTracer(gles2::GLES2Decoder* decoder);
+  GPUTracer(gles2::GLES2Decoder* decoder, GPUTiming* gpu_timing);
   virtual ~GPUTracer();
 
   // 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,
@@ skipping 19 matching lines @@
 
   void IssueProcessTask();
 
   scoped_refptr<Outputter> outputter_;
   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_;
-  gpu::GPUTiming gpu_timing_;
+  GPUTiming* gpu_timing_;
+  int disjoint_context_id_;
 
   bool gpu_executing_;
   bool process_posted_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GPUTracer);
 };
 
 class Outputter : public base::RefCounted<Outputter> {
  public:
@@ skipping 36 matching lines @@
   uint64 local_trace_id_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TraceOutputter);
 };
 
 class GPU_EXPORT GPUTrace
     : public base::RefCounted<GPUTrace> {
  public:
   GPUTrace(scoped_refptr<Outputter> outputter,
-           gpu::GPUTiming* gpu_timing,
+           GPUTiming* gpu_timing,
            const std::string& category,
            const std::string& name,
            const bool enabled);
 
   void Start(bool trace_service);
   void End(bool tracing_service);
   bool IsAvailable();
   bool IsEnabled() { return enabled_; }
   void Process();
 
@@ skipping 27 matching lines @@
 
  private:
   GPUTracer* gpu_tracer_;
   GpuTracerSource source_;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GPU_TRACER_H_