ui/gl/gl_image_ref_counted_memory.cc - Issue 301793003: During image destroy, delete textures only if we have a GL context.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gl/gl_image_ref_counted_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

Index: ui/gl/gl_image_ref_counted_memory.cc

diff --git a/ui/gl/gl_image_ref_counted_memory.cc b/ui/gl/gl_image_ref_counted_memory.cc

index 5ca65d0abc062fff7b9c714c8f8397da0fedecc3..e6d5ba6e4a2e4f66aa35fc33ed60baccf7c474e9 100644

--- a/ui/gl/gl_image_ref_counted_memory.cc

+++ b/ui/gl/gl_image_ref_counted_memory.cc

@@ -15,7 +15,7 @@ GLImageRefCountedMemory::GLImageRefCountedMemory(const gfx::Size& size,

}

GLImageRefCountedMemory::~GLImageRefCountedMemory() {

- Destroy();

+ DCHECK(!ref_counted_memory_);

}

bool GLImageRefCountedMemory::Initialize(

@@ -29,8 +29,8 @@ bool GLImageRefCountedMemory::Initialize(

return true;

}

-void GLImageRefCountedMemory::Destroy() {

- GLImageMemory::Destroy();

+void GLImageRefCountedMemory::Destroy(bool have_context) {

+ GLImageMemory::Destroy(have_context);

ref_counted_memory_ = NULL;

}

« no previous file with comments | « ui/gl/gl_image_ref_counted_memory.h ('k') | ui/gl/gl_image_shared_memory.h » ('j') | no next file with comments »