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

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: cleanup 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
« no previous file with comments | « media/base/pipeline_impl_unittest.cc ('k') | media/filters/decoder_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webmediaplayer_impl.cc
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index 832433691bd68828415cd0e6ee98628d11754c88..c4cd1170246743802e0d9a7f1e7d9f78f65bc7e1 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -230,25 +230,15 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
}
WebMediaPlayerImpl::~WebMediaPlayerImpl() {
- client_->setWebLayer(NULL);
-
DCHECK(main_task_runner_->BelongsToCurrentThread());
+ 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;
sandersd (OOO until July 31) 2016/06/03 23:11:45 Probably group this with setWebLayer().
alokp 2016/06/03 23:57:49 Done.
- if (data_source_)
sandersd (OOO until July 31) 2016/06/03 23:11:45 I don't see any change in PipelineImpl related to
alokp 2016/06/03 23:57:49 I can move these changes to a separate patch if yo
- 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();
« no previous file with comments | « media/base/pipeline_impl_unittest.cc ('k') | media/filters/decoder_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698