Index: ui/gfx/gl/gl_context_cgl.h |
diff --git a/ui/gfx/gl/gl_context_cgl.h b/ui/gfx/gl/gl_context_cgl.h |
index 021882bb42f4ecfb50895643fd1e246779405b21..a33e2adb5eff591e682da773c988ca3b876e1fb6 100644 |
--- a/ui/gfx/gl/gl_context_cgl.h |
+++ b/ui/gfx/gl/gl_context_cgl.h |
@@ -12,11 +12,10 @@ class GLSurface; |
class GLContextCGL : public GLContext { |
public: |
explicit GLContextCGL(GLShareGroup* share_group); |
- virtual ~GLContextCGL(); |
// Implement GLContext. |
- virtual bool Initialize( |
- GLSurface* compatible_surface, GpuPreference gpu_preference) OVERRIDE; |
+ virtual bool Initialize(GLSurface* compatible_surface, |
+ GpuPreference gpu_preference) OVERRIDE; |
virtual void Destroy() OVERRIDE; |
virtual bool MakeCurrent(GLSurface* surface) OVERRIDE; |
virtual void ReleaseCurrent(GLSurface* surface) OVERRIDE; |
@@ -24,12 +23,12 @@ class GLContextCGL : public GLContext { |
virtual void* GetHandle() OVERRIDE; |
virtual void SetSwapInterval(int interval) OVERRIDE; |
- // Expose ForceUseOfDiscreteGPU only to GLContext implementation. |
- friend class GLContext; |
+ protected: |
+ virtual ~GLContextCGL(); |
private: |
- void* context_; |
- GpuPreference gpu_preference_; |
+ // Expose ForceUseOfDiscreteGPU only to GLContext implementation. |
+ friend class GLContext; |
GpuPreference GetGpuPreference(); |
@@ -37,6 +36,9 @@ class GLContextCGL : public GLContext { |
// for stability reasons. |
static void ForceUseOfDiscreteGPU(); |
+ void* context_; |
+ GpuPreference gpu_preference_; |
+ |
DISALLOW_COPY_AND_ASSIGN(GLContextCGL); |
}; |