Refactored GLContext to own GPUTiming which spawn GPUTimingClients.

ui/gl/gl_context.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.
 
 #ifndef UI_GL_GL_CONTEXT_H_
 #define UI_GL_GL_CONTEXT_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "ui/gl/gl_share_group.h"
 #include "ui/gl/gl_state_restorer.h"
 #include "ui/gl/gpu_preference.h"
 
+namespace gpu {
+  class GPUTiming;
+}
+
 namespace gfx {
 
 class GLSurface;
 class VirtualGLApi;
 struct GLVersionInfo;
 
 // Encapsulates an OpenGL context, hiding platform specific management.
 class GL_EXPORT GLContext : public base::RefCounted<GLContext> {
  public:
   explicit GLContext(GLShareGroup* share_group);
@@ skipping 55 matching lines @@
   virtual void SetUnbindFboOnMakeCurrent();
 
   // Returns whether the current context supports the named extension. The
   // context must be current.
   bool HasExtension(const char* name);
 
   // Returns version info of the underlying GL context. The context must be
   // current.
   const GLVersionInfo* GetVersionInfo();
 
+  // Returns a GPUTiming object used to create GPUTimingClients. This class
+  // is used to abstract the various GPU Timing extensions.
+  gpu::GPUTiming* GetGPUTiming();
+
   GLShareGroup* share_group();
 
   // Create a GL context that is compatible with the given surface.
   // |share_group|, if non-NULL, is a group of contexts which the
   // internally created OpenGL context shares textures and other resources.
   static scoped_refptr<GLContext> CreateGLContext(
       GLShareGroup* share_group,
       GLSurface* compatible_surface,
       GpuPreference gpu_preference);
 
@@ skipping 52 matching lines @@
  private:
   friend class base::RefCounted<GLContext>;
 
   // For GetRealCurrent.
   friend class VirtualGLApi;
 
   scoped_refptr<GLShareGroup> share_group_;
   scoped_ptr<VirtualGLApi> virtual_gl_api_;
   scoped_ptr<GLStateRestorer> state_restorer_;
   scoped_ptr<GLVersionInfo> version_info_;
+  scoped_ptr<gpu::GPUTiming> gpu_timing_;
 
   int swap_interval_;
   bool force_swap_interval_zero_;
 
   DISALLOW_COPY_AND_ASSIGN(GLContext);
 };
 
 class GL_EXPORT GLContextReal : public GLContext {
  public:
   explicit GLContextReal(GLShareGroup* share_group);
 
  protected:
   ~GLContextReal() override;
 
   void SetCurrent(GLSurface* surface) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GLContextReal);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GL_GL_CONTEXT_H_