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

Side by Side 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 4 years, 12 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/base/text_renderer.h" 5 #include "media/base/text_renderer.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility>
8 9
9 #include "base/bind.h" 10 #include "base/bind.h"
10 #include "base/callback_helpers.h" 11 #include "base/callback_helpers.h"
11 #include "base/logging.h" 12 #include "base/logging.h"
12 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
13 #include "base/stl_util.h" 14 #include "base/stl_util.h"
14 #include "media/base/bind_to_current_loop.h" 15 #include "media/base/bind_to_current_loop.h"
15 #include "media/base/decoder_buffer.h" 16 #include "media/base/decoder_buffer.h"
16 #include "media/base/demuxer.h" 17 #include "media/base/demuxer.h"
17 #include "media/base/text_cue.h" 18 #include "media/base/text_cue.h"
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 } 290 }
290 } 291 }
291 292
292 void TextRenderer::OnAddTextTrackDone(DemuxerStream* text_stream, 293 void TextRenderer::OnAddTextTrackDone(DemuxerStream* text_stream,
293 scoped_ptr<TextTrack> text_track) { 294 scoped_ptr<TextTrack> text_track) {
294 DCHECK(task_runner_->BelongsToCurrentThread()); 295 DCHECK(task_runner_->BelongsToCurrentThread());
295 DCHECK_NE(state_, kUninitialized); 296 DCHECK_NE(state_, kUninitialized);
296 DCHECK(text_stream); 297 DCHECK(text_stream);
297 DCHECK(text_track); 298 DCHECK(text_track);
298 299
299 scoped_ptr<TextTrackState> state(new TextTrackState(text_track.Pass())); 300 scoped_ptr<TextTrackState> state(new TextTrackState(std::move(text_track)));
300 text_track_state_map_[text_stream] = state.release(); 301 text_track_state_map_[text_stream] = state.release();
301 pending_eos_set_.insert(text_stream); 302 pending_eos_set_.insert(text_stream);
302 303
303 if (state_ == kPlaying) 304 if (state_ == kPlaying)
304 Read(text_track_state_map_[text_stream], text_stream); 305 Read(text_track_state_map_[text_stream], text_stream);
305 } 306 }
306 307
307 void TextRenderer::Read( 308 void TextRenderer::Read(
308 TextTrackState* state, 309 TextTrackState* state,
309 DemuxerStream* text_stream) { 310 DemuxerStream* text_stream) {
310 DCHECK_NE(state->read_state, TextTrackState::kReadPending); 311 DCHECK_NE(state->read_state, TextTrackState::kReadPending);
311 312
312 state->read_state = TextTrackState::kReadPending; 313 state->read_state = TextTrackState::kReadPending;
313 ++pending_read_count_; 314 ++pending_read_count_;
314 315
315 text_stream->Read(base::Bind( 316 text_stream->Read(base::Bind(
316 &TextRenderer::BufferReady, weak_factory_.GetWeakPtr(), text_stream)); 317 &TextRenderer::BufferReady, weak_factory_.GetWeakPtr(), text_stream));
317 } 318 }
318 319
319 TextRenderer::TextTrackState::TextTrackState(scoped_ptr<TextTrack> tt) 320 TextRenderer::TextTrackState::TextTrackState(scoped_ptr<TextTrack> tt)
320 : read_state(kReadIdle), 321 : read_state(kReadIdle), text_track(std::move(tt)) {}
321 text_track(tt.Pass()) {
322 }
323 322
324 TextRenderer::TextTrackState::~TextTrackState() { 323 TextRenderer::TextTrackState::~TextTrackState() {
325 } 324 }
326 325
327 } // namespace media 326 } // namespace media
OLDNEW
« 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