| Index: ui/gl/gl_surface_glx.h
|
| diff --git a/ui/gl/gl_surface_glx.h b/ui/gl/gl_surface_glx.h
|
| index ac4655e990232baed679fc1534d0ba0aca3f7e19..f4416e81af6b8ed1622e99ef2cbff9a675c67d99 100644
|
| --- a/ui/gl/gl_surface_glx.h
|
| +++ b/ui/gl/gl_surface_glx.h
|
| @@ -19,7 +19,6 @@ namespace gfx {
|
| class GL_EXPORT GLSurfaceGLX : public GLSurface {
|
| public:
|
| GLSurfaceGLX();
|
| - virtual ~GLSurfaceGLX();
|
|
|
| static bool InitializeOneOff();
|
|
|
| @@ -36,6 +35,9 @@ class GL_EXPORT GLSurfaceGLX : public GLSurface {
|
| // a GLX drawable.
|
| virtual void* GetConfig() = 0;
|
|
|
| + protected:
|
| + virtual ~GLSurfaceGLX();
|
| +
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(GLSurfaceGLX);
|
| };
|
| @@ -44,7 +46,6 @@ class GL_EXPORT GLSurfaceGLX : public GLSurface {
|
| class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX {
|
| public:
|
| explicit NativeViewGLSurfaceGLX(gfx::AcceleratedWidget window);
|
| - virtual ~NativeViewGLSurfaceGLX();
|
|
|
| // Implement GLSurfaceGLX.
|
| virtual bool Initialize() OVERRIDE;
|
| @@ -60,6 +61,7 @@ class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX {
|
|
|
| protected:
|
| NativeViewGLSurfaceGLX();
|
| + virtual ~NativeViewGLSurfaceGLX();
|
|
|
| gfx::AcceleratedWidget window_;
|
|
|
| @@ -74,7 +76,6 @@ class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX {
|
| class GL_EXPORT PbufferGLSurfaceGLX : public GLSurfaceGLX {
|
| public:
|
| explicit PbufferGLSurfaceGLX(const gfx::Size& size);
|
| - virtual ~PbufferGLSurfaceGLX();
|
|
|
| // Implement GLSurfaceGLX.
|
| virtual bool Initialize() OVERRIDE;
|
| @@ -85,6 +86,9 @@ class GL_EXPORT PbufferGLSurfaceGLX : public GLSurfaceGLX {
|
| virtual void* GetHandle() OVERRIDE;
|
| virtual void* GetConfig() OVERRIDE;
|
|
|
| + protected:
|
| + virtual ~PbufferGLSurfaceGLX();
|
| +
|
| private:
|
| gfx::Size size_;
|
| void* config_;
|
|
|