content/common/gpu/client/command_buffer_proxy_impl.cc - Issue 10852009: Clarify ownership of GpuVideoDecodeAcceleratorHost and avoid crash on context loss.

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/client/command_buffer_proxy_impl.cc

Issue 10852009: Clarify ownership of GpuVideoDecodeAcceleratorHost and avoid crash on context loss. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 years, 4 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 | « content/common/gpu/client/command_buffer_proxy_impl.h ('k') | content/common/gpu/client/gpu_video_decode_accelerator_host.h » ('j') | media/filters/gpu_video_decoder.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/client/command_buffer_proxy_impl.cc

diff --git a/content/common/gpu/client/command_buffer_proxy_impl.cc b/content/common/gpu/client/command_buffer_proxy_impl.cc

index 2d6a168500a728209d0ea53d940f4c2667303567..d6387747ab17b175341db4dc2a7c6c0be91a19e4 100644

--- a/content/common/gpu/client/command_buffer_proxy_impl.cc

+++ b/content/common/gpu/client/command_buffer_proxy_impl.cc

@@ -48,7 +48,8 @@ CommandBufferProxyImpl::~CommandBufferProxyImpl() {

}

for (Decoders::iterator it = video_decoder_hosts_.begin();

it != video_decoder_hosts_.end(); ++it) {

- it->second->Destroy();

+ if (it->second)

+ it->second->OnChannelError();

}

@@ -506,7 +507,7 @@ CommandBufferProxyImpl::CreateVideoDecoder(

GpuVideoDecodeAcceleratorHost* decoder_host =

new GpuVideoDecodeAcceleratorHost(channel_, decoder_route_id, client);

bool inserted = video_decoder_hosts_.insert(std::make_pair(

- decoder_route_id, decoder_host)).second;

+ decoder_route_id, base::AsWeakPtr(decoder_host))).second;

DCHECK(inserted);

channel_->AddRoute(decoder_route_id, base::AsWeakPtr(decoder_host));