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

Unified Diff: media/blink/webmediaplayer_impl.cc

Issue 1999893004: Splits PipelineImpl into main and media thread components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed comments Created 4 years, 6 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/blink/webmediaplayer_impl.cc
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index 832433691bd68828415cd0e6ee98628d11754c88..defc865aba94329335913e1c44779577f35a530a 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -230,26 +230,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();

Powered by Google App Engine
This is Rietveld 408576698