From b249c9b7321e96611e734959d2fea604c5a39cfc Mon Sep 17 00:00:00 2001
From: Kaku Kuo <kaku@mozilla.com>
Date: Tue, 18 Apr 2017 15:46:05 +0800
Subject: [PATCH] Bug 1360123 P3 - while shutting down a MediaDecoder, ask its
 owner to remove all media tracks; r=jwwang

MozReview-Commit-ID: 6s84iyXJQ9k

--HG--
extra : rebase_source : 443d6fafd8c17d02dba6ba0054abbb473079545a
---
 dom/media/MediaDecoder.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp
index f9cb426a7faf..588d07a58db5 100644
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -503,6 +503,9 @@ MediaDecoder::Shutdown()
     mResource->Close();
   }
 
+  // Ask the owner to remove its audio/video tracks.
+  GetOwner()->RemoveMediaTracks();
+
   ChangeState(PLAY_STATE_SHUTDOWN);
   mOwner = nullptr;
 }