| 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 80e0b1c9f6f88f67fbd3faf7fd1a137e09865b91..ebbc909b9d524c5dd0b291929080b05a94c8460d 100644
|
| --- a/content/common/gpu/client/command_buffer_proxy_impl.cc
|
| +++ b/content/common/gpu/client/command_buffer_proxy_impl.cc
|
| @@ -29,7 +29,8 @@ using gpu::Buffer;
|
| CommandBufferProxyImpl::CommandBufferProxyImpl(
|
| GpuChannelHost* channel,
|
| int route_id)
|
| - : shared_state_(NULL),
|
| + : video_decoder_hosts_deleter_(&video_decoder_hosts_),
|
| + shared_state_(NULL),
|
| channel_(channel),
|
| route_id_(route_id),
|
| flush_count_(0),
|
| @@ -483,7 +484,7 @@ void CommandBufferProxyImpl::SetNotifyRepaintTask(const base::Closure& task) {
|
| notify_repaint_task_ = task;
|
| }
|
|
|
| -scoped_refptr<GpuVideoDecodeAcceleratorHost>
|
| +GpuVideoDecodeAcceleratorHost*
|
| CommandBufferProxyImpl::CreateVideoDecoder(
|
| media::VideoCodecProfile profile,
|
| media::VideoDecodeAccelerator::Client* client) {
|
| @@ -499,13 +500,13 @@ CommandBufferProxyImpl::CreateVideoDecoder(
|
| return NULL;
|
| }
|
|
|
| - scoped_refptr<GpuVideoDecodeAcceleratorHost> decoder_host =
|
| + 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;
|
| DCHECK(inserted);
|
|
|
| - channel_->AddRoute(decoder_route_id, decoder_host->AsWeakPtr());
|
| + channel_->AddRoute(decoder_route_id, base::AsWeakPtr(decoder_host));
|
|
|
| return decoder_host;
|
| }
|
|
|