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

Unified Diff: ui/gl/gl_image_shared_memory.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_shared_memory.h ('k') | ui/gl/gl_image_stub.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_shared_memory.cc
diff --git a/ui/gl/gl_image_shared_memory.cc b/ui/gl/gl_image_shared_memory.cc
index 7c578ba8baaf4b9f646e15ea37c47c770fa54ba7..7c615f8efabc9f191267995c96b1a55092799d04 100644
--- a/ui/gl/gl_image_shared_memory.cc
+++ b/ui/gl/gl_image_shared_memory.cc
@@ -15,7 +15,7 @@ GLImageSharedMemory::GLImageSharedMemory(const gfx::Size& size,
}
GLImageSharedMemory::~GLImageSharedMemory() {
- Destroy();
+ DCHECK(!shared_memory_);
}
bool GLImageSharedMemory::Initialize(const gfx::GpuMemoryBufferHandle& handle) {
@@ -50,8 +50,8 @@ bool GLImageSharedMemory::Initialize(const gfx::GpuMemoryBufferHandle& handle) {
return true;
}
-void GLImageSharedMemory::Destroy() {
- GLImageMemory::Destroy();
+void GLImageSharedMemory::Destroy(bool have_context) {
+ GLImageMemory::Destroy(have_context);
shared_memory_.reset();
}
« no previous file with comments | « ui/gl/gl_image_shared_memory.h ('k') | ui/gl/gl_image_stub.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698