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

Unified Diff: media/mojo/services/mojo_demuxer_stream_adapter.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_decryptor_service.cc ('k') | media/mojo/services/mojo_demuxer_stream_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_demuxer_stream_adapter.cc
diff --git a/media/mojo/services/mojo_demuxer_stream_adapter.cc b/media/mojo/services/mojo_demuxer_stream_adapter.cc
index 2f7970464eb00ad8ad3691515e03089d5f97265d..850f7bc9960cc7f4e2707bc152372e076a8e4725 100644
--- a/media/mojo/services/mojo_demuxer_stream_adapter.cc
+++ b/media/mojo/services/mojo_demuxer_stream_adapter.cc
@@ -5,6 +5,7 @@
#include "media/mojo/services/mojo_demuxer_stream_adapter.h"
#include <stdint.h>
+#include <utility>
#include "base/bind.h"
#include "base/callback_helpers.h"
@@ -17,7 +18,7 @@ namespace media {
MojoDemuxerStreamAdapter::MojoDemuxerStreamAdapter(
interfaces::DemuxerStreamPtr demuxer_stream,
const base::Closure& stream_ready_cb)
- : demuxer_stream_(demuxer_stream.Pass()),
+ : demuxer_stream_(std::move(demuxer_stream)),
stream_ready_cb_(stream_ready_cb),
type_(DemuxerStream::UNKNOWN),
weak_factory_(this) {
@@ -79,8 +80,8 @@ void MojoDemuxerStreamAdapter::OnStreamReady(
DCHECK_EQ(DemuxerStream::UNKNOWN, type_);
type_ = static_cast<DemuxerStream::Type>(type);
- stream_pipe_ = pipe.Pass();
- UpdateConfig(audio_config.Pass(), video_config.Pass());
+ stream_pipe_ = std::move(pipe);
+ UpdateConfig(std::move(audio_config), std::move(video_config));
stream_ready_cb_.Run();
}
@@ -96,7 +97,7 @@ void MojoDemuxerStreamAdapter::OnBufferReady(
DCHECK(stream_pipe_.is_valid());
if (status == interfaces::DemuxerStream::STATUS_CONFIG_CHANGED) {
- UpdateConfig(audio_config.Pass(), video_config.Pass());
+ UpdateConfig(std::move(audio_config), std::move(video_config));
base::ResetAndReturn(&read_cb_).Run(DemuxerStream::kConfigChanged, nullptr);
return;
}
« no previous file with comments | « media/mojo/services/mojo_decryptor_service.cc ('k') | media/mojo/services/mojo_demuxer_stream_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698