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

Unified Diff: media/base/text_renderer.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/base/serial_runner.cc ('k') | media/base/text_renderer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/text_renderer.cc
diff --git a/media/base/text_renderer.cc b/media/base/text_renderer.cc
index da0e6f381768cb2b627d797d05a8461f59b3e19c..2add40c3da7f38ead50326fe1bd1fa882bda9fc1 100644
--- a/media/base/text_renderer.cc
+++ b/media/base/text_renderer.cc
@@ -5,6 +5,7 @@
#include "media/base/text_renderer.h"
#include <stddef.h>
+#include <utility>
#include "base/bind.h"
#include "base/callback_helpers.h"
@@ -296,7 +297,7 @@ void TextRenderer::OnAddTextTrackDone(DemuxerStream* text_stream,
DCHECK(text_stream);
DCHECK(text_track);
- scoped_ptr<TextTrackState> state(new TextTrackState(text_track.Pass()));
+ scoped_ptr<TextTrackState> state(new TextTrackState(std::move(text_track)));
text_track_state_map_[text_stream] = state.release();
pending_eos_set_.insert(text_stream);
@@ -317,9 +318,7 @@ void TextRenderer::Read(
}
TextRenderer::TextTrackState::TextTrackState(scoped_ptr<TextTrack> tt)
- : read_state(kReadIdle),
- text_track(tt.Pass()) {
-}
+ : read_state(kReadIdle), text_track(std::move(tt)) {}
TextRenderer::TextTrackState::~TextTrackState() {
}
« no previous file with comments | « media/base/serial_runner.cc ('k') | media/base/text_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698