| Index: ui/gl/gl_surface_cgl.h
|
| diff --git a/ui/gl/gl_surface_cgl.h b/ui/gl/gl_surface_cgl.h
|
| index 4786acdb4a06323d8cdee8a3a8867e4a05f81649..3ad4cccac828502971faf414521dc9332b54843a 100644
|
| --- a/ui/gl/gl_surface_cgl.h
|
| +++ b/ui/gl/gl_surface_cgl.h
|
| @@ -11,17 +11,13 @@
|
| namespace gfx {
|
|
|
| // Base class for CGL surfaces.
|
| -class GLSurfaceCGL : public GLSurface {
|
| +class GLSurfaceCGL {
|
| public:
|
| - GLSurfaceCGL();
|
| -
|
| static bool InitializeOneOff();
|
| static void* GetPixelFormat();
|
|
|
| - protected:
|
| - virtual ~GLSurfaceCGL();
|
| -
|
| private:
|
| + GLSurfaceCGL() {}
|
| DISALLOW_COPY_AND_ASSIGN(GLSurfaceCGL);
|
| };
|
|
|
| @@ -29,7 +25,7 @@ class GLSurfaceCGL : public GLSurface {
|
| // associated drawable (pbuffer or fullscreen context) in order to be
|
| // made current. Everywhere this surface type is used, we allocate an
|
| // FBO at the user level as the drawable of the associated context.
|
| -class GL_EXPORT NoOpGLSurfaceCGL : public GLSurfaceCGL {
|
| +class GL_EXPORT NoOpGLSurfaceCGL : public GLSurface {
|
| public:
|
| explicit NoOpGLSurfaceCGL(const gfx::Size& size);
|
|
|
|
|