| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/output/copy_output_result.h" | 5 #include "cc/output/copy_output_result.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "cc/resources/texture_mailbox.h" | 8 #include "cc/resources/texture_mailbox.h" |
| 9 #include "third_party/skia/include/core/SkBitmap.h" | 9 #include "third_party/skia/include/core/SkBitmap.h" |
| 10 | 10 |
| 11 namespace cc { | 11 namespace cc { |
| 12 | 12 |
| 13 CopyOutputResult::CopyOutputResult() {} | 13 CopyOutputResult::CopyOutputResult() {} |
| 14 | 14 |
| 15 CopyOutputResult::CopyOutputResult(scoped_ptr<SkBitmap> bitmap) | 15 CopyOutputResult::CopyOutputResult(scoped_ptr<SkBitmap> bitmap) |
| 16 : size_(bitmap->width(), bitmap->height()), | 16 : size_(bitmap->width(), bitmap->height()), bitmap_(std::move(bitmap)) { |
| 17 bitmap_(bitmap.Pass()) { | |
| 18 DCHECK(bitmap_); | 17 DCHECK(bitmap_); |
| 19 } | 18 } |
| 20 | 19 |
| 21 CopyOutputResult::CopyOutputResult( | 20 CopyOutputResult::CopyOutputResult( |
| 22 const gfx::Size& size, | 21 const gfx::Size& size, |
| 23 const TextureMailbox& texture_mailbox, | 22 const TextureMailbox& texture_mailbox, |
| 24 scoped_ptr<SingleReleaseCallback> release_callback) | 23 scoped_ptr<SingleReleaseCallback> release_callback) |
| 25 : size_(size), | 24 : size_(size), |
| 26 texture_mailbox_(texture_mailbox), | 25 texture_mailbox_(texture_mailbox), |
| 27 release_callback_(release_callback.Pass()) { | 26 release_callback_(std::move(release_callback)) { |
| 28 DCHECK(texture_mailbox_.IsTexture()); | 27 DCHECK(texture_mailbox_.IsTexture()); |
| 29 } | 28 } |
| 30 | 29 |
| 31 CopyOutputResult::~CopyOutputResult() { | 30 CopyOutputResult::~CopyOutputResult() { |
| 32 if (release_callback_) | 31 if (release_callback_) |
| 33 release_callback_->Run(gpu::SyncToken(), false); | 32 release_callback_->Run(gpu::SyncToken(), false); |
| 34 } | 33 } |
| 35 | 34 |
| 36 scoped_ptr<SkBitmap> CopyOutputResult::TakeBitmap() { | 35 scoped_ptr<SkBitmap> CopyOutputResult::TakeBitmap() { |
| 37 return bitmap_.Pass(); | 36 return std::move(bitmap_); |
| 38 } | 37 } |
| 39 | 38 |
| 40 void CopyOutputResult::TakeTexture( | 39 void CopyOutputResult::TakeTexture( |
| 41 TextureMailbox* texture_mailbox, | 40 TextureMailbox* texture_mailbox, |
| 42 scoped_ptr<SingleReleaseCallback>* release_callback) { | 41 scoped_ptr<SingleReleaseCallback>* release_callback) { |
| 43 *texture_mailbox = texture_mailbox_; | 42 *texture_mailbox = texture_mailbox_; |
| 44 *release_callback = release_callback_.Pass(); | 43 *release_callback = std::move(release_callback_); |
| 45 | 44 |
| 46 texture_mailbox_ = TextureMailbox(); | 45 texture_mailbox_ = TextureMailbox(); |
| 47 } | 46 } |
| 48 | 47 |
| 49 } // namespace cc | 48 } // namespace cc |
| OLD | NEW |