| Index: content/common/gpu/media/fake_video_decode_accelerator.cc
|
| diff --git a/content/common/gpu/media/fake_video_decode_accelerator.cc b/content/common/gpu/media/fake_video_decode_accelerator.cc
|
| index eff497f48e7fbad6bb33a02ca00774ab59628a71..84a40eb9ba4801e254b64c2cf56cb687da046105 100644
|
| --- a/content/common/gpu/media/fake_video_decode_accelerator.cc
|
| +++ b/content/common/gpu/media/fake_video_decode_accelerator.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/location.h"
|
| -#include "base/thread_task_runner_handle.h"
|
| #include "media/base/bitstream_buffer.h"
|
| #include "media/base/limits.h"
|
| #include "ui/gl/gl_context.h"
|
| @@ -29,7 +28,7 @@
|
| gfx::GLContext* gl,
|
| gfx::Size size,
|
| const base::Callback<bool(void)>& make_context_current)
|
| - : child_task_runner_(base::ThreadTaskRunnerHandle::Get()),
|
| + : child_message_loop_proxy_(base::MessageLoopProxy::current()),
|
| client_(NULL),
|
| make_context_current_(make_context_current),
|
| gl_(gl),
|
| @@ -43,7 +42,7 @@
|
|
|
| bool FakeVideoDecodeAccelerator::Initialize(media::VideoCodecProfile profile,
|
| Client* client) {
|
| - DCHECK(child_task_runner_->BelongsToCurrentThread());
|
| + DCHECK(child_message_loop_proxy_->BelongsToCurrentThread());
|
| if (profile == media::VIDEO_CODEC_PROFILE_UNKNOWN) {
|
| LOG(ERROR) << "unknown codec profile";
|
| return false;
|
| @@ -61,9 +60,10 @@
|
| const media::BitstreamBuffer& bitstream_buffer) {
|
| int bitstream_buffer_id = bitstream_buffer.id();
|
| queued_bitstream_ids_.push(bitstream_buffer_id);
|
| - child_task_runner_->PostTask(
|
| - FROM_HERE, base::Bind(&FakeVideoDecodeAccelerator::DoPictureReady,
|
| - weak_this_factory_.GetWeakPtr()));
|
| + child_message_loop_proxy_->PostTask(
|
| + FROM_HERE,
|
| + base::Bind(&FakeVideoDecodeAccelerator::DoPictureReady,
|
| + weak_this_factory_.GetWeakPtr()));
|
| }
|
|
|
| // Similar to UseOutputBitstreamBuffer for the encode accelerator.
|
| @@ -107,23 +107,26 @@
|
| glBindTexture(GL_TEXTURE_2D, 0);
|
| free_output_buffers_.push(buffers[index].id());
|
| }
|
| - child_task_runner_->PostTask(
|
| - FROM_HERE, base::Bind(&FakeVideoDecodeAccelerator::DoPictureReady,
|
| - weak_this_factory_.GetWeakPtr()));
|
| + child_message_loop_proxy_->PostTask(
|
| + FROM_HERE,
|
| + base::Bind(&FakeVideoDecodeAccelerator::DoPictureReady,
|
| + weak_this_factory_.GetWeakPtr()));
|
| }
|
|
|
| void FakeVideoDecodeAccelerator::ReusePictureBuffer(int32 picture_buffer_id) {
|
| free_output_buffers_.push(picture_buffer_id);
|
| - child_task_runner_->PostTask(
|
| - FROM_HERE, base::Bind(&FakeVideoDecodeAccelerator::DoPictureReady,
|
| - weak_this_factory_.GetWeakPtr()));
|
| + child_message_loop_proxy_->PostTask(
|
| + FROM_HERE,
|
| + base::Bind(&FakeVideoDecodeAccelerator::DoPictureReady,
|
| + weak_this_factory_.GetWeakPtr()));
|
| }
|
|
|
| void FakeVideoDecodeAccelerator::Flush() {
|
| flushing_ = true;
|
| - child_task_runner_->PostTask(
|
| - FROM_HERE, base::Bind(&FakeVideoDecodeAccelerator::DoPictureReady,
|
| - weak_this_factory_.GetWeakPtr()));
|
| + child_message_loop_proxy_->PostTask(
|
| + FROM_HERE,
|
| + base::Bind(&FakeVideoDecodeAccelerator::DoPictureReady,
|
| + weak_this_factory_.GetWeakPtr()));
|
| }
|
|
|
| void FakeVideoDecodeAccelerator::Reset() {
|
|
|