| Index: ui/gl/gl_surface_glx.cc
|
| diff --git a/ui/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc
|
| index ba8ce925556eaf9bbd8f4bb29cbb6c752a1ba606..a5609cd8e23cf35e0b20a3506d0150e3c9bf53ee 100644
|
| --- a/ui/gl/gl_surface_glx.cc
|
| +++ b/ui/gl/gl_surface_glx.cc
|
| @@ -38,11 +38,7 @@ bool g_glx_create_context_robustness_supported = false;
|
|
|
| } // namespace anonymous
|
|
|
| -GLSurfaceGLX::GLSurfaceGLX() {
|
| -}
|
| -
|
| -GLSurfaceGLX::~GLSurfaceGLX() {
|
| -}
|
| +GLSurfaceGLX::GLSurfaceGLX() {}
|
|
|
| bool GLSurfaceGLX::InitializeOneOff() {
|
| static bool initialized = false;
|
| @@ -103,20 +99,13 @@ void* GLSurfaceGLX::GetDisplay() {
|
| return g_display;
|
| }
|
|
|
| +GLSurfaceGLX::~GLSurfaceGLX() {}
|
| +
|
| NativeViewGLSurfaceGLX::NativeViewGLSurfaceGLX(gfx::AcceleratedWidget window)
|
| : window_(window),
|
| config_(NULL) {
|
| }
|
|
|
| -NativeViewGLSurfaceGLX::NativeViewGLSurfaceGLX()
|
| - : window_(0),
|
| - config_(NULL) {
|
| -}
|
| -
|
| -NativeViewGLSurfaceGLX::~NativeViewGLSurfaceGLX() {
|
| - Destroy();
|
| -}
|
| -
|
| bool NativeViewGLSurfaceGLX::Initialize() {
|
| XWindowAttributes attributes;
|
| if (!XGetWindowAttributes(g_display, window_, &attributes)) {
|
| @@ -234,16 +223,21 @@ bool NativeViewGLSurfaceGLX::PostSubBuffer(
|
| return true;
|
| }
|
|
|
| +NativeViewGLSurfaceGLX::NativeViewGLSurfaceGLX()
|
| + : window_(0),
|
| + config_(NULL) {
|
| +}
|
| +
|
| +NativeViewGLSurfaceGLX::~NativeViewGLSurfaceGLX() {
|
| + Destroy();
|
| +}
|
| +
|
| PbufferGLSurfaceGLX::PbufferGLSurfaceGLX(const gfx::Size& size)
|
| : size_(size),
|
| config_(NULL),
|
| pbuffer_(0) {
|
| }
|
|
|
| -PbufferGLSurfaceGLX::~PbufferGLSurfaceGLX() {
|
| - Destroy();
|
| -}
|
| -
|
| bool PbufferGLSurfaceGLX::Initialize() {
|
| DCHECK(!pbuffer_);
|
|
|
| @@ -323,4 +317,8 @@ void* PbufferGLSurfaceGLX::GetConfig() {
|
| return config_;
|
| }
|
|
|
| +PbufferGLSurfaceGLX::~PbufferGLSurfaceGLX() {
|
| + Destroy();
|
| +}
|
| +
|
| } // namespace gfx
|
|
|