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

Unified Diff: media/mojo/services/mojo_decryptor_service.cc

Issue 1544313002: Convert Pass()→std::move() in //media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | « media/mojo/services/mojo_cdm_service.cc ('k') | media/mojo/services/mojo_demuxer_stream_adapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_decryptor_service.cc
diff --git a/media/mojo/services/mojo_decryptor_service.cc b/media/mojo/services/mojo_decryptor_service.cc
index 60d634d30709d2e568d2f9c648053875eeefd561..ad068b4ed807921fe230461fdd17e2417f09f474 100644
--- a/media/mojo/services/mojo_decryptor_service.cc
+++ b/media/mojo/services/mojo_decryptor_service.cc
@@ -25,7 +25,7 @@ MojoDecryptorService::MojoDecryptorService(
const scoped_refptr<MediaKeys>& cdm,
mojo::InterfaceRequest<interfaces::Decryptor> request,
const mojo::Closure& error_handler)
- : binding_(this, request.Pass()), cdm_(cdm), weak_factory_(this) {
+ : binding_(this, std::move(request)), cdm_(cdm), weak_factory_(this) {
decryptor_ = cdm->GetCdmContext()->GetDecryptor();
DCHECK(decryptor_);
weak_this_ = weak_factory_.GetWeakPtr();
@@ -148,9 +148,10 @@ void MojoDecryptorService::OnAudioDecoded(
<< status << ")";
mojo::Array<interfaces::AudioBufferPtr> audio_buffers;
for (const auto& frame : frames)
- audio_buffers.push_back(interfaces::AudioBuffer::From(frame).Pass());
+ audio_buffers.push_back(interfaces::AudioBuffer::From(frame));
- callback.Run(static_cast<Decryptor::Status>(status), audio_buffers.Pass());
+ callback.Run(static_cast<Decryptor::Status>(status),
+ std::move(audio_buffers));
}
void MojoDecryptorService::OnVideoDecoded(
@@ -166,7 +167,7 @@ void MojoDecryptorService::OnVideoDecoded(
}
callback.Run(static_cast<Decryptor::Status>(status),
- interfaces::VideoFrame::From(frame).Pass());
+ interfaces::VideoFrame::From(frame));
}
interfaces::DecoderBufferPtr MojoDecryptorService::TransferDecoderBuffer(
« no previous file with comments | « media/mojo/services/mojo_cdm_service.cc ('k') | media/mojo/services/mojo_demuxer_stream_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698