Merge M50: "Supress pipeline errors during destruction and suspend."

media/blink/webmediaplayer_impl.cc

Index: media/blink/webmediaplayer_impl.cc
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index 1f8b3405a578c8228aa126b685effbc4492bcc89..5a2983035b4da72066d08d304c99f2df4506c5a5 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -186,7 +186,8 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
       volume_(1.0),
       volume_multiplier_(1.0),
       renderer_factory_(std::move(renderer_factory)),
-      surface_manager_(params.surface_manager()) {
+      surface_manager_(params.surface_manager()),
+      suppress_destruction_errors_(false) {
   DCHECK(!adjust_allocated_memory_cb_.is_null());
   DCHECK(renderer_factory_);
 
@@ -223,6 +224,7 @@ WebMediaPlayerImpl::~WebMediaPlayerImpl() {
   }
 
   // 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_) {
@@ -1002,6 +1004,11 @@ void WebMediaPlayerImpl::OnPipelineError(PipelineStatus error) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   DCHECK_NE(error, PIPELINE_OK);
 
+  if (suppress_destruction_errors_)
+    return;
+
+  media_log_->AddEvent(media_log_->CreatePipelineErrorEvent(error));
+
   if (ready_state_ == WebMediaPlayer::ReadyStateHaveNothing) {
     // Any error that occurs before reaching ReadyStateHaveMetadata should
     // be considered a format error.