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

Side by Side Diff: media/base/text_renderer.cc

Issue 2234753002: media: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 4 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/android/access_unit_queue.cc ('k') | media/blink/cdm_session_adapter.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 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 12 matching lines...) Expand all
23 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 23 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
24 const AddTextTrackCB& add_text_track_cb) 24 const AddTextTrackCB& add_text_track_cb)
25 : task_runner_(task_runner), 25 : task_runner_(task_runner),
26 add_text_track_cb_(add_text_track_cb), 26 add_text_track_cb_(add_text_track_cb),
27 state_(kUninitialized), 27 state_(kUninitialized),
28 pending_read_count_(0), 28 pending_read_count_(0),
29 weak_factory_(this) {} 29 weak_factory_(this) {}
30 30
31 TextRenderer::~TextRenderer() { 31 TextRenderer::~TextRenderer() {
32 DCHECK(task_runner_->BelongsToCurrentThread()); 32 DCHECK(task_runner_->BelongsToCurrentThread());
33 STLDeleteValues(&text_track_state_map_); 33 base::STLDeleteValues(&text_track_state_map_);
34 if (!pause_cb_.is_null()) 34 if (!pause_cb_.is_null())
35 base::ResetAndReturn(&pause_cb_).Run(); 35 base::ResetAndReturn(&pause_cb_).Run();
36 } 36 }
37 37
38 void TextRenderer::Initialize(const base::Closure& ended_cb) { 38 void TextRenderer::Initialize(const base::Closure& ended_cb) {
39 DCHECK(task_runner_->BelongsToCurrentThread()); 39 DCHECK(task_runner_->BelongsToCurrentThread());
40 DCHECK(!ended_cb.is_null()); 40 DCHECK(!ended_cb.is_null());
41 DCHECK_EQ(kUninitialized, state_) << "state_ " << state_; 41 DCHECK_EQ(kUninitialized, state_) << "state_ " << state_;
42 DCHECK(text_track_state_map_.empty()); 42 DCHECK(text_track_state_map_.empty());
43 DCHECK_EQ(pending_read_count_, 0); 43 DCHECK_EQ(pending_read_count_, 0);
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 &TextRenderer::BufferReady, weak_factory_.GetWeakPtr(), text_stream)); 318 &TextRenderer::BufferReady, weak_factory_.GetWeakPtr(), text_stream));
319 } 319 }
320 320
321 TextRenderer::TextTrackState::TextTrackState(std::unique_ptr<TextTrack> tt) 321 TextRenderer::TextTrackState::TextTrackState(std::unique_ptr<TextTrack> tt)
322 : read_state(kReadIdle), text_track(std::move(tt)) {} 322 : read_state(kReadIdle), text_track(std::move(tt)) {}
323 323
324 TextRenderer::TextTrackState::~TextTrackState() { 324 TextRenderer::TextTrackState::~TextTrackState() {
325 } 325 }
326 326
327 } // namespace media 327 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/access_unit_queue.cc ('k') | media/blink/cdm_session_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698