| Index: gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc
|
| diff --git a/gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc b/gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc
|
| index 47cdf9e1988065175a861c5a5e630f780d2b64fa..3c65f7210b0d5eebf9b94e305a2eb927eb1d72bd 100644
|
| --- a/gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc
|
| +++ b/gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc
|
| @@ -8,9 +8,11 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/lazy_instance.h"
|
| +#include "base/location.h"
|
| #include "base/logging.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| +#include "base/single_thread_task_runner.h"
|
| #include "base/synchronization/cancellation_flag.h"
|
| #include "base/synchronization/lock.h"
|
| #include "base/synchronization/waitable_event.h"
|
| @@ -62,12 +64,11 @@ class TransferThread : public base::Thread {
|
| return;
|
|
|
| base::WaitableEvent wait_for_init(true, false);
|
| - message_loop_proxy()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(&TransferThread::InitializeOnTransferThread,
|
| - base::Unretained(this),
|
| - base::Unretained(parent_context),
|
| - &wait_for_init));
|
| + task_runner()->PostTask(
|
| + FROM_HERE,
|
| + base::Bind(&TransferThread::InitializeOnTransferThread,
|
| + base::Unretained(this), base::Unretained(parent_context),
|
| + &wait_for_init));
|
| wait_for_init.Wait();
|
| }
|
|
|
| @@ -123,8 +124,8 @@ class TransferThread : public base::Thread {
|
| base::LazyInstance<TransferThread>::Leaky
|
| g_transfer_thread = LAZY_INSTANCE_INITIALIZER;
|
|
|
| -base::MessageLoopProxy* transfer_message_loop_proxy() {
|
| - return g_transfer_thread.Pointer()->message_loop_proxy().get();
|
| +base::SingleThreadTaskRunner* transfer_task_runner() {
|
| + return g_transfer_thread.Pointer()->task_runner().get();
|
| }
|
|
|
| class PendingTask : public base::RefCountedThreadSafe<PendingTask> {
|
| @@ -246,10 +247,9 @@ class TransferStateInternal
|
| tex_params,
|
| mem_params,
|
| texture_upload_stats));
|
| - transfer_message_loop_proxy()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(
|
| - &PendingTask::BindAndRun, pending_upload_task_, texture_id_));
|
| + transfer_task_runner()->PostTask(
|
| + FROM_HERE, base::Bind(&PendingTask::BindAndRun, pending_upload_task_,
|
| + texture_id_));
|
|
|
| // Save the late bind callback, so we can notify the client when it is
|
| // bound.
|
| @@ -267,10 +267,9 @@ class TransferStateInternal
|
| tex_params,
|
| mem_params,
|
| texture_upload_stats));
|
| - transfer_message_loop_proxy()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(
|
| - &PendingTask::BindAndRun, pending_upload_task_, texture_id_));
|
| + transfer_task_runner()->PostTask(
|
| + FROM_HERE, base::Bind(&PendingTask::BindAndRun, pending_upload_task_,
|
| + texture_id_));
|
| }
|
|
|
| private:
|
| @@ -505,11 +504,9 @@ void AsyncPixelTransferManagerShareGroup::AsyncNotifyCompletion(
|
| AsyncPixelTransferCompletionObserver* observer) {
|
| // Post a PerformNotifyCompletion task to the upload thread. This task
|
| // will run after all async transfers are complete.
|
| - transfer_message_loop_proxy()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(&PerformNotifyCompletion,
|
| - mem_params,
|
| - make_scoped_refptr(observer)));
|
| + transfer_task_runner()->PostTask(
|
| + FROM_HERE, base::Bind(&PerformNotifyCompletion, mem_params,
|
| + make_scoped_refptr(observer)));
|
| }
|
|
|
| uint32 AsyncPixelTransferManagerShareGroup::GetTextureUploadCount() {
|
|
|