Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(844)

Unified Diff: ui/gl/gl_image_glx.cc

Issue 301793003: During image destroy, delete textures only if we have a GL context. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments addressed. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/gl/gl_image_glx.cc
diff --git a/ui/gl/gl_image_glx.cc b/ui/gl/gl_image_glx.cc
index 61bd0971d00599d87b34bb5cd876d40ad89b7edd..9770cc2001ab7fd7952fcf41123bcf3c167a5f7c 100644
--- a/ui/gl/gl_image_glx.cc
+++ b/ui/gl/gl_image_glx.cc
@@ -111,7 +111,9 @@ GLImageGLX::GLImageGLX(const gfx::Size& size, unsigned internalformat)
: glx_pixmap_(0), size_(size), internalformat_(internalformat) {
}
-GLImageGLX::~GLImageGLX() { Destroy(); }
+GLImageGLX::~GLImageGLX() {
+ DCHECK_EQ(0u, glx_pixmap_);
+}
bool GLImageGLX::Initialize(XID pixmap) {
if (!GLSurfaceGLX::IsTextureFromPixmapSupported()) {
@@ -160,7 +162,7 @@ bool GLImageGLX::Initialize(XID pixmap) {
return true;
}
-void GLImageGLX::Destroy() {
+void GLImageGLX::Destroy(bool have_context) {
if (glx_pixmap_) {
glXDestroyGLXPixmap(gfx::GetXDisplay(), glx_pixmap_);
glx_pixmap_ = 0;
@@ -182,7 +184,8 @@ bool GLImageGLX::BindTexImage(unsigned target) {
}
void GLImageGLX::ReleaseTexImage(unsigned target) {
- DCHECK(glx_pixmap_);
+ if (!glx_pixmap_)
+ return;
reveman 2014/07/27 23:58:32 nit: you don't have to change this. please keep it
sohanjg 2014/07/28 10:15:58 Done.
DCHECK_EQ(static_cast<GLenum>(GL_TEXTURE_2D), target);
glXReleaseTexImageEXT(gfx::GetXDisplay(), glx_pixmap_, GLX_FRONT_LEFT_EXT);

Powered by Google App Engine
This is Rietveld 408576698