Chromium Code Reviews| Index: ui/gl/gl_image_glx.cc |
| diff --git a/ui/gl/gl_image_glx.cc b/ui/gl/gl_image_glx.cc |
| index 4b7e883781cd8160e6bc6c49d38be238088fc6bd..d49ca8f49133429a0b0c5b624269892e7447240b 100644 |
| --- a/ui/gl/gl_image_glx.cc |
| +++ b/ui/gl/gl_image_glx.cc |
| @@ -49,7 +49,10 @@ GLImageGLX::GLImageGLX(gfx::PluginWindowHandle window) |
| pixmap_(0), |
| glx_pixmap_(0) {} |
| -GLImageGLX::~GLImageGLX() { Destroy(); } |
| +GLImageGLX::~GLImageGLX() { |
| + DCHECK_EQ(0u, glx_pixmap_); |
| + DCHECK_EQ(0u, pixmap_); |
| +} |
| bool GLImageGLX::Initialize() { |
| if (!GLSurfaceGLX::IsTextureFromPixmapSupported()) { |
| @@ -98,6 +101,10 @@ bool GLImageGLX::Initialize() { |
| // Create backing pixmap reference. |
| pixmap_ = XCompositeNameWindowPixmap(display_, window_); |
| + if (!pixmap_) { |
| + LOG(ERROR) << "XCompositeNameWindowPixmap failed."; |
| + return false; |
| + } |
|
reveman
2014/06/02 14:34:47
This doesn't help in any way as XCompositeNameWind
sohanjg
2014/06/02 15:39:10
Done.
|
| XID root = 0; |
| int x = 0; |
| @@ -126,7 +133,7 @@ bool GLImageGLX::Initialize() { |
| return true; |
| } |
| -void GLImageGLX::Destroy() { |
| +void GLImageGLX::Destroy(bool have_context) { |
| if (glx_pixmap_) { |
| glXDestroyGLXPixmap(display_, glx_pixmap_); |
| glx_pixmap_ = 0; |