content/common/gpu/gpu_channel.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: content/common/gpu/gpu_channel.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: Move ImageManager destroy to GPUChannel + review comments 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

Index: content/common/gpu/gpu_channel.cc

diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc

index 1c8e4f95f3cb853e72a7ab1829288f19ed86b002..1a46d5da01a8f45c6ec74075f861ddf648a89fad 100644

--- a/content/common/gpu/gpu_channel.cc

+++ b/content/common/gpu/gpu_channel.cc

@@ -404,6 +404,10 @@ GpuChannel::~GpuChannel() {

STLDeleteElements(&deferred_messages_);

if (preempting_flag_.get())

preempting_flag_->Reset();

+ if (image_manager_ != NULL) {

reveman 2014/06/02 16:45:29 nit: "if (image_manager_)" instead and you can rem

sohanjg 2014/06/03 05:48:33 Done.

+ image_manager_->Destroy(true);

+ }

}

void GpuChannel::Init(base::MessageLoopProxy* io_message_loop,

« no previous file with comments | « no previous file | content/common/gpu/stream_texture_android.h » ('j') | gpu/command_buffer/service/image_manager.cc » ('J')