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

Unified Diff: media/mojo/services/mojo_renderer_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_renderer_impl.cc ('k') | media/renderers/audio_renderer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_renderer_service.cc
diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc
index d0d04d90247cda5ee39e6a71b8902b7e30c87183..f4915004c4bb74ff9281e883abe6b6ec4623ab5d 100644
--- a/media/mojo/services/mojo_renderer_service.cc
+++ b/media/mojo/services/mojo_renderer_service.cc
@@ -4,6 +4,8 @@
#include "media/mojo/services/mojo_renderer_service.h"
+#include <utility>
+
#include "base/bind.h"
#include "media/base/renderer.h"
#include "media/mojo/services/demuxer_stream_provider_shim.h"
@@ -17,9 +19,9 @@ MojoRendererService::MojoRendererService(
base::WeakPtr<CdmContextProvider> cdm_context_provider,
scoped_ptr<media::Renderer> renderer,
mojo::InterfaceRequest<interfaces::Renderer> request)
- : binding_(this, request.Pass()),
+ : binding_(this, std::move(request)),
cdm_context_provider_(cdm_context_provider),
- renderer_(renderer.Pass()),
+ renderer_(std::move(renderer)),
state_(STATE_UNINITIALIZED),
last_media_time_usec_(0),
weak_factory_(this) {
@@ -37,11 +39,10 @@ void MojoRendererService::Initialize(
const mojo::Callback<void(bool)>& callback) {
DVLOG(1) << __FUNCTION__;
DCHECK_EQ(state_, STATE_UNINITIALIZED);
- client_ = client.Pass();
+ client_ = std::move(client);
state_ = STATE_INITIALIZING;
stream_provider_.reset(new DemuxerStreamProviderShim(
- audio.Pass(),
- video.Pass(),
+ std::move(audio), std::move(video),
base::Bind(&MojoRendererService::OnStreamReady, weak_this_, callback)));
}
« no previous file with comments | « media/mojo/services/mojo_renderer_impl.cc ('k') | media/renderers/audio_renderer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698