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

Unified Diff: cc/output/copy_output_result.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/copy_output_result.h ('k') | cc/output/delegating_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/copy_output_result.cc
diff --git a/cc/output/copy_output_result.cc b/cc/output/copy_output_result.cc
index 704aa9ab5e33b92904d3b0bb8a74dc000e948561..84e9ef834208a6af350d1fef18beb1ac8f433568 100644
--- a/cc/output/copy_output_result.cc
+++ b/cc/output/copy_output_result.cc
@@ -13,8 +13,7 @@ namespace cc {
CopyOutputResult::CopyOutputResult() {}
CopyOutputResult::CopyOutputResult(scoped_ptr<SkBitmap> bitmap)
- : size_(bitmap->width(), bitmap->height()),
- bitmap_(bitmap.Pass()) {
+ : size_(bitmap->width(), bitmap->height()), bitmap_(std::move(bitmap)) {
DCHECK(bitmap_);
}
@@ -24,7 +23,7 @@ CopyOutputResult::CopyOutputResult(
scoped_ptr<SingleReleaseCallback> release_callback)
: size_(size),
texture_mailbox_(texture_mailbox),
- release_callback_(release_callback.Pass()) {
+ release_callback_(std::move(release_callback)) {
DCHECK(texture_mailbox_.IsTexture());
}
@@ -34,14 +33,14 @@ CopyOutputResult::~CopyOutputResult() {
}
scoped_ptr<SkBitmap> CopyOutputResult::TakeBitmap() {
- return bitmap_.Pass();
+ return std::move(bitmap_);
}
void CopyOutputResult::TakeTexture(
TextureMailbox* texture_mailbox,
scoped_ptr<SingleReleaseCallback>* release_callback) {
*texture_mailbox = texture_mailbox_;
- *release_callback = release_callback_.Pass();
+ *release_callback = std::move(release_callback_);
texture_mailbox_ = TextureMailbox();
}
« no previous file with comments | « cc/output/copy_output_result.h ('k') | cc/output/delegating_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698