Added disjoint context class which manages disjoints within gpu timing.

gpu/command_buffer/service/gpu_tracer.h

Index: gpu/command_buffer/service/gpu_tracer.h
diff --git a/gpu/command_buffer/service/gpu_tracer.h b/gpu/command_buffer/service/gpu_tracer.h
index c8ac9d76b60339af790276713eef1bf56e03fe05..2d6a7a8e5f0cea5447c53ad6ea39d61c9944a180 100644
--- a/gpu/command_buffer/service/gpu_tracer.h
+++ b/gpu/command_buffer/service/gpu_tracer.h
@@ -50,7 +50,7 @@ struct TraceMarker {
 class GPU_EXPORT GPUTracer
     : public base::SupportsWeakPtr<GPUTracer> {
  public:
-  explicit GPUTracer(gles2::GLES2Decoder* decoder);
+  explicit GPUTracer(gles2::GLES2Decoder* decoder, GPUTiming* gpu_timing);

[Daniele Castagna, 2015/02/19 18:15:32]

nit: remove explicit

[David Yen, 2015/02/19 19:00:47]

Done.

   virtual ~GPUTracer();
 
   // Scheduled processing in decoder begins.
@@ -90,7 +90,8 @@ class GPU_EXPORT GPUTracer
   const unsigned char* gpu_trace_srv_category;
   const unsigned char* gpu_trace_dev_category;
   gles2::GLES2Decoder* decoder_;
-  gpu::GPUTiming gpu_timing_;
+  GPUTiming* gpu_timing_;
+  scoped_refptr<DisjointContext> disjoint_context_;
 
   bool gpu_executing_;
   bool process_posted_;
@@ -147,7 +148,7 @@ 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);