media/filters/decoder_stream.cc - Issue 398163004: Fold DecoderSelector::Abort() into the dtor.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/filters/decoder_stream.cc

Issue 398163004: Fold DecoderSelector::Abort() into the dtor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase only Created 6 years, 5 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:

Index: media/filters/decoder_stream.cc

diff --git a/media/filters/decoder_stream.cc b/media/filters/decoder_stream.cc

index 35b361790131a078aa81712666db28748723d2ad..10916ea9808fc7348c60ba26092c2090e6ad2746 100644

--- a/media/filters/decoder_stream.cc

+++ b/media/filters/decoder_stream.cc

@@ -59,9 +59,7 @@ DecoderStream<StreamType>::~DecoderStream() {

FUNCTION_DVLOG(2);

DCHECK(task_runner_->BelongsToCurrentThread());

- // TODO(xhwang): Fold DecoderSelector::Abort() into the dtor.

- if (state_ == STATE_INITIALIZING)

- decoder_selector_->Abort();

+ decoder_selector_.reset();

if (!init_cb_.is_null()) {

task_runner_->PostTask(FROM_HERE,

« no previous file with comments | « media/filters/decoder_selector.cc ('k') | media/filters/video_decoder_selector_unittest.cc » ('j') | no next file with comments »