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

Unified Diff: cc/output/copy_output_request.cc

Issue 1455023002: cc: Replace Pass() with std::move() in some subdirs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pass-cc
Patch Set: pass-cc2: . Created 5 years, 1 month 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 | « cc/output/compositor_frame.cc ('k') | cc/output/copy_output_result.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/copy_output_request.cc
diff --git a/cc/output/copy_output_request.cc b/cc/output/copy_output_request.cc
index fce92a322162b0b66cfa415c967747cef74f3d20..7077457b4fd081e9f3b64c7970b23dc2d90116ce 100644
--- a/cc/output/copy_output_request.cc
+++ b/cc/output/copy_output_request.cc
@@ -24,7 +24,7 @@ scoped_ptr<CopyOutputRequest> CopyOutputRequest::CreateRelayRequest(
relay->area_ = original_request.area_;
relay->has_texture_mailbox_ = original_request.has_texture_mailbox_;
relay->texture_mailbox_ = original_request.texture_mailbox_;
- return relay.Pass();
+ return relay;
}
CopyOutputRequest::CopyOutputRequest()
@@ -52,7 +52,7 @@ CopyOutputRequest::~CopyOutputRequest() {
void CopyOutputRequest::SendResult(scoped_ptr<CopyOutputResult> result) {
bool success = !result->IsEmpty();
- base::ResetAndReturn(&result_callback_).Run(result.Pass());
+ base::ResetAndReturn(&result_callback_).Run(std::move(result));
TRACE_EVENT_ASYNC_END1("cc", "CopyOutputRequest", this, "success", success);
}
@@ -61,7 +61,7 @@ void CopyOutputRequest::SendEmptyResult() {
}
void CopyOutputRequest::SendBitmapResult(scoped_ptr<SkBitmap> bitmap) {
- SendResult(CopyOutputResult::CreateBitmapResult(bitmap.Pass()).Pass());
+ SendResult(CopyOutputResult::CreateBitmapResult(std::move(bitmap)).Pass());
}
void CopyOutputRequest::SendTextureResult(
@@ -70,7 +70,7 @@ void CopyOutputRequest::SendTextureResult(
scoped_ptr<SingleReleaseCallback> release_callback) {
DCHECK(texture_mailbox.IsTexture());
SendResult(CopyOutputResult::CreateTextureResult(
- size, texture_mailbox, release_callback.Pass()));
+ size, texture_mailbox, std::move(release_callback)));
}
void CopyOutputRequest::SetTextureMailbox(
« no previous file with comments | « cc/output/compositor_frame.cc ('k') | cc/output/copy_output_result.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698