Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(744)

Unified Diff: content/renderer/render_widget.cc

Issue 657763002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/pepper/content_decryptor_delegate.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « content/renderer/pepper/content_decryptor_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698