Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(57)

Unified Diff: ui/gfx/gl/gl_context_cgl.h

Issue 10067034: RefCounted types should not have public destructors, printing/ and ui/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Implementation ordering Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
};

Powered by Google App Engine
This is Rietveld 408576698