Chromium Code Reviews| Index: remoting/client/frame_consumer_proxy.cc |
| diff --git a/remoting/client/frame_consumer_proxy.cc b/remoting/client/frame_consumer_proxy.cc |
| index b65f324d6a3b5870878c03c0bf9a005fd91b2240..90d11194f2bd06889dbb551631394508309580fd 100644 |
| --- a/remoting/client/frame_consumer_proxy.cc |
| +++ b/remoting/client/frame_consumer_proxy.cc |
| @@ -5,22 +5,23 @@ |
| #include "remoting/client/frame_consumer_proxy.h" |
| #include "base/bind.h" |
| -#include "base/message_loop.h" |
| +#include "base/location.h" |
| +#include "base/single_thread_task_runner.h" |
| #include "ppapi/cpp/image_data.h" |
| namespace remoting { |
| FrameConsumerProxy::FrameConsumerProxy( |
| - scoped_refptr<base::MessageLoopProxy> frame_consumer_message_loop) |
| - : frame_consumer_message_loop_(frame_consumer_message_loop) { |
| + scoped_refptr<base::SingleThreadTaskRunner> frame_consumer_task_runner) |
| + : frame_consumer_task_runner_(frame_consumer_task_runner) { |
| } |
| void FrameConsumerProxy::ApplyBuffer(const SkISize& view_size, |
| const SkIRect& clip_area, |
| pp::ImageData* buffer, |
| const SkRegion& region) { |
| - if (!frame_consumer_message_loop_->BelongsToCurrentThread()) { |
| - frame_consumer_message_loop_->PostTask(FROM_HERE, base::Bind( |
| + if (!frame_consumer_task_runner_->BelongsToCurrentThread()) { |
| + frame_consumer_task_runner_->PostTask(FROM_HERE, base::Bind( |
| &FrameConsumerProxy::ApplyBuffer, this, |
| view_size, clip_area, buffer, region)); |
| return; |
| @@ -31,8 +32,8 @@ void FrameConsumerProxy::ApplyBuffer(const SkISize& view_size, |
| } |
| void FrameConsumerProxy::ReturnBuffer(pp::ImageData* buffer) { |
| - if (!frame_consumer_message_loop_->BelongsToCurrentThread()) { |
| - frame_consumer_message_loop_->PostTask(FROM_HERE, base::Bind( |
| + if (!frame_consumer_task_runner_->BelongsToCurrentThread()) { |
| + frame_consumer_task_runner_->PostTask(FROM_HERE, base::Bind( |
| &FrameConsumerProxy::ReturnBuffer, this, buffer)); |
| return; |
| } |
| @@ -42,8 +43,8 @@ void FrameConsumerProxy::ReturnBuffer(pp::ImageData* buffer) { |
| } |
| void FrameConsumerProxy::SetSourceSize(const SkISize& source_size) { |
| - if (!frame_consumer_message_loop_->BelongsToCurrentThread()) { |
| - frame_consumer_message_loop_->PostTask(FROM_HERE, base::Bind( |
| + if (!frame_consumer_task_runner_->BelongsToCurrentThread()) { |
| + frame_consumer_task_runner_->PostTask(FROM_HERE, base::Bind( |
| &FrameConsumerProxy::SetSourceSize, this, source_size)); |
| return; |
| } |
| @@ -54,13 +55,13 @@ void FrameConsumerProxy::SetSourceSize(const SkISize& source_size) { |
| void FrameConsumerProxy::Attach( |
| const base::WeakPtr<FrameConsumer>& frame_consumer) { |
| - DCHECK(frame_consumer_message_loop_->BelongsToCurrentThread()); |
| + DCHECK(frame_consumer_task_runner_->BelongsToCurrentThread()); |
| DCHECK(frame_consumer_ == NULL); |
| frame_consumer_ = frame_consumer; |
| } |
| FrameConsumerProxy::~FrameConsumerProxy() { |
| - DCHECK(frame_consumer_message_loop_->BelongsToCurrentThread()); |
| + DCHECK(frame_consumer_task_runner_->BelongsToCurrentThread()); |
|
Wez
2012/05/26 00:18:40
This DCHECK() looks wrong. FrameConsumerProxy is r
Sergey Ulanov
2012/05/30 01:07:07
Agree. Removed it.
|
| } |
| } // namespace remoting |