| Index: content/renderer/render_widget.cc
|
| diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
|
| index 8658aebb8b92cf921e280a6fe469366142dd0fe3..442163bbc66ef35a6e6e5e05a7b9084161eca5ad 100644
|
| --- a/content/renderer/render_widget.cc
|
| +++ b/content/renderer/render_widget.cc
|
| @@ -1278,7 +1278,7 @@ scoped_ptr<cc::SwapPromise> RenderWidget::QueueMessageImpl(
|
| // don't have any now, no other thread will add any.
|
| frame_swap_message_queue->Empty()) {
|
| sync_message_filter->Send(msg);
|
| - return scoped_ptr<cc::SwapPromise>();
|
| + return nullptr;
|
| }
|
|
|
| bool first_message_for_frame = false;
|
| @@ -1289,9 +1289,9 @@ scoped_ptr<cc::SwapPromise> RenderWidget::QueueMessageImpl(
|
| if (first_message_for_frame) {
|
| scoped_ptr<cc::SwapPromise> promise(new QueueMessageSwapPromise(
|
| sync_message_filter, frame_swap_message_queue, source_frame_number));
|
| - return promise.PassAs<cc::SwapPromise>();
|
| + return promise;
|
| }
|
| - return scoped_ptr<cc::SwapPromise>();
|
| + return nullptr;
|
| }
|
|
|
| void RenderWidget::QueueMessage(IPC::Message* msg,
|
|
|