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

Unified Diff: media/base/text_renderer.cc

Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-media-base: . Created 4 years, 8 months 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
Index: media/base/text_renderer.cc
diff --git a/media/base/text_renderer.cc b/media/base/text_renderer.cc
index 2bb489b2a1eea0aa0376e2dd3a1e389560349b43..902a53a8c6917eebf02050283c54f771bd6d437d 100644
--- a/media/base/text_renderer.cc
+++ b/media/base/text_renderer.cc
@@ -291,13 +291,14 @@ void TextRenderer::CueReady(
}
void TextRenderer::OnAddTextTrackDone(DemuxerStream* text_stream,
- scoped_ptr<TextTrack> text_track) {
+ std::unique_ptr<TextTrack> text_track) {
DCHECK(task_runner_->BelongsToCurrentThread());
DCHECK_NE(state_, kUninitialized);
DCHECK(text_stream);
DCHECK(text_track);
- scoped_ptr<TextTrackState> state(new TextTrackState(std::move(text_track)));
+ std::unique_ptr<TextTrackState> state(
+ new TextTrackState(std::move(text_track)));
text_track_state_map_[text_stream] = state.release();
pending_eos_set_.insert(text_stream);
@@ -317,7 +318,7 @@ void TextRenderer::Read(
&TextRenderer::BufferReady, weak_factory_.GetWeakPtr(), text_stream));
}
-TextRenderer::TextTrackState::TextTrackState(scoped_ptr<TextTrack> tt)
+TextRenderer::TextTrackState::TextTrackState(std::unique_ptr<TextTrack> tt)
: read_state(kReadIdle), text_track(std::move(tt)) {}
TextRenderer::TextTrackState::~TextTrackState() {

Powered by Google App Engine
This is Rietveld 408576698