gpu/command_buffer/service/image_manager.h - 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: gpu/command_buffer/service/image_manager.h

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 comment 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

« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc ('k') | gpu/command_buffer/service/image_manager.cc » ('j') | gpu/command_buffer/service/image_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/image_manager.h

diff --git a/gpu/command_buffer/service/image_manager.h b/gpu/command_buffer/service/image_manager.h

index eadf24619d8ecb2ff5390ead5bdcd155c77140f7..9ac26b0631a647a6b1feaa717b723094b028e1c4 100644

--- a/gpu/command_buffer/service/image_manager.h

+++ b/gpu/command_buffer/service/image_manager.h

@@ -23,12 +23,13 @@ class GPU_EXPORT ImageManager {

ImageManager();

~ImageManager();

- void AddImage(gfx::GLImage* image, int32 service_id);

- void RemoveImage(int32 service_id);

+ void Destroy(bool have_context);

+ bool AddImage(gfx::GLImage* image, int32 service_id);

+ bool RemoveImage(int32 service_id);

no sievers 2014/07/30 12:34:08 I'd leave RemoveImage() as returning void

sohanjg 2014/07/30 13:08:02 Done.

gfx::GLImage* LookupImage(int32 service_id);

private:

- typedef base::hash_map<uint32, scoped_refptr<gfx::GLImage> > GLImageMap;

+ typedef base::hash_map<int32, scoped_refptr<gfx::GLImage> > GLImageMap;

GLImageMap images_;

DISALLOW_COPY_AND_ASSIGN(ImageManager);