| Index: ui/gl/gl_surface_linux.cc
|
| diff --git a/ui/gl/gl_surface_linux.cc b/ui/gl/gl_surface_linux.cc
|
| index a7dbdf08a30cbcb7992344f70b2a23d4d71f6eb6..d6576054e08cab61aef515548302e18fd3b62643 100644
|
| --- a/ui/gl/gl_surface_linux.cc
|
| +++ b/ui/gl/gl_surface_linux.cc
|
| @@ -26,7 +26,6 @@ Display* g_osmesa_display;
|
| class NativeViewGLSurfaceOSMesa : public GLSurfaceOSMesa {
|
| public:
|
| explicit NativeViewGLSurfaceOSMesa(gfx::AcceleratedWidget window);
|
| - virtual ~NativeViewGLSurfaceOSMesa();
|
|
|
| static bool InitializeOneOff();
|
|
|
| @@ -39,6 +38,9 @@ class NativeViewGLSurfaceOSMesa : public GLSurfaceOSMesa {
|
| virtual std::string GetExtensions() OVERRIDE;
|
| virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE;
|
|
|
| + protected:
|
| + virtual ~NativeViewGLSurfaceOSMesa();
|
| +
|
| private:
|
| GC window_graphics_context_;
|
| gfx::AcceleratedWidget window_;
|
| @@ -85,10 +87,6 @@ NativeViewGLSurfaceOSMesa::NativeViewGLSurfaceOSMesa(
|
| DCHECK(window);
|
| }
|
|
|
| -NativeViewGLSurfaceOSMesa::~NativeViewGLSurfaceOSMesa() {
|
| - Destroy();
|
| -}
|
| -
|
| bool NativeViewGLSurfaceOSMesa::InitializeOneOff() {
|
| static bool initialized = false;
|
| if (initialized)
|
| @@ -260,6 +258,10 @@ bool NativeViewGLSurfaceOSMesa::PostSubBuffer(
|
| return true;
|
| }
|
|
|
| +NativeViewGLSurfaceOSMesa::~NativeViewGLSurfaceOSMesa() {
|
| + Destroy();
|
| +}
|
| +
|
| scoped_refptr<GLSurface> GLSurface::CreateViewGLSurface(
|
| bool software,
|
| gfx::AcceleratedWidget window) {
|
|
|