| 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();
|
| }
|
|
|