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

Unified Diff: ui/gl/gl_image_io_surface.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: resolve android clang dbg build issue. 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
« no previous file with comments | « ui/gl/gl_image_io_surface.h ('k') | ui/gl/gl_image_memory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_io_surface.cc
diff --git a/ui/gl/gl_image_io_surface.cc b/ui/gl/gl_image_io_surface.cc
index cf858abbf6d3ee5ff02532e9789e37338614f950..eb78ce9ab0be950116aadb9a5cc68b708e6affce 100644
--- a/ui/gl/gl_image_io_surface.cc
+++ b/ui/gl/gl_image_io_surface.cc
@@ -15,7 +15,9 @@ namespace gfx {
GLImageIOSurface::GLImageIOSurface(const gfx::Size& size) : size_(size) {
}
-GLImageIOSurface::~GLImageIOSurface() { Destroy(); }
+GLImageIOSurface::~GLImageIOSurface() {
+ DCHECK(!io_surface_);
+}
bool GLImageIOSurface::Initialize(const gfx::GpuMemoryBufferHandle& handle) {
io_surface_.reset(IOSurfaceLookup(handle.io_surface_id));
@@ -27,6 +29,10 @@ bool GLImageIOSurface::Initialize(const gfx::GpuMemoryBufferHandle& handle) {
return true;
}
+void GLImageIOSurface::Destroy(bool have_context) {
+ io_surface_.reset();
+}
+
gfx::Size GLImageIOSurface::GetSize() { return size_; }
bool GLImageIOSurface::BindTexImage(unsigned target) {
« no previous file with comments | « ui/gl/gl_image_io_surface.h ('k') | ui/gl/gl_image_memory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698