| Index: media/blink/webmediaplayer_impl.cc
|
| diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
|
| index 4b35df5f8ab25491b2b5e16f2b55cc8dffa7bda8..12835699e8efdc29328e6d7341ae6cafe0b9977e 100644
|
| --- a/media/blink/webmediaplayer_impl.cc
|
| +++ b/media/blink/webmediaplayer_impl.cc
|
| @@ -231,26 +231,15 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
|
| }
|
|
|
| WebMediaPlayerImpl::~WebMediaPlayerImpl() {
|
| - client_->setWebLayer(NULL);
|
| -
|
| DCHECK(main_task_runner_->BelongsToCurrentThread());
|
|
|
| + suppress_destruction_errors_ = true;
|
| + client_->setWebLayer(NULL);
|
| if (delegate_) {
|
| delegate_->PlayerGone(delegate_id_);
|
| delegate_->RemoveObserver(delegate_id_);
|
| }
|
|
|
| - // Abort any pending IO so stopping the pipeline doesn't get blocked.
|
| - suppress_destruction_errors_ = true;
|
| - if (data_source_)
|
| - data_source_->Abort();
|
| - if (chunk_demuxer_) {
|
| - chunk_demuxer_->Shutdown();
|
| - chunk_demuxer_ = nullptr;
|
| - }
|
| -
|
| - renderer_factory_.reset();
|
| -
|
| // Pipeline must be stopped before it is destroyed.
|
| pipeline_.Stop();
|
|
|
|
|