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

Unified Diff: ui/gl/gl_image_surface_texture.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: Destroy GLImage during ContextGroup destroy Created 6 years, 7 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
« ui/gl/gl_image_stub.cc ('K') | « ui/gl/gl_image_surface_texture.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_surface_texture.cc
diff --git a/ui/gl/gl_image_surface_texture.cc b/ui/gl/gl_image_surface_texture.cc
index 8d0a0e7e22b0476da7157aeae8c0a106bbcd1a96..55aecc7a421f66590f98eaaf87c2e4f75c208c41 100644
--- a/ui/gl/gl_image_surface_texture.cc
+++ b/ui/gl/gl_image_surface_texture.cc
@@ -13,7 +13,9 @@ namespace gfx {
GLImageSurfaceTexture::GLImageSurfaceTexture(gfx::Size size)
: size_(size), texture_id_(0) {}
-GLImageSurfaceTexture::~GLImageSurfaceTexture() { Destroy(); }
+GLImageSurfaceTexture::~GLImageSurfaceTexture() {
+ Destroy(false);
reveman 2014/05/29 16:30:34 No call to Destroy in dtor please. Instead verify
+}
bool GLImageSurfaceTexture::Initialize(gfx::GpuMemoryBufferHandle buffer) {
DCHECK(!surface_texture_);
@@ -24,7 +26,7 @@ bool GLImageSurfaceTexture::Initialize(gfx::GpuMemoryBufferHandle buffer) {
return !!surface_texture_;
}
-void GLImageSurfaceTexture::Destroy() {
+void GLImageSurfaceTexture::Destroy(bool have_context) {
surface_texture_ = NULL;
texture_id_ = 0;
}
« ui/gl/gl_image_stub.cc ('K') | « ui/gl/gl_image_surface_texture.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698