Bug 1270154: P1. Forget the media element's media-resource-specific tracks when error occurs. r?jwwang draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Wed, 11 May 2016 21:18:46 +1000
changeset 365922 f9e5e1cecda07f5a88fb2f14a5e18a4a3f7e17db
parent 365921 a4a650440913082f894933d142b68d3d16ec1abb
child 520646 38808c05ad13515e02a1473c7387ed3cfc12fc63
push id17839
push userbmo:jyavenard@mozilla.com
push dateWed, 11 May 2016 13:59:51 +0000
reviewersjwwang
bugs1270154
milestone47.0
Bug 1270154: P1. Forget the media element's media-resource-specific tracks when error occurs. r?jwwang MozReview-Commit-ID: BFpw2sS7aa7
dom/html/HTMLMediaElement.cpp
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -3494,16 +3494,18 @@ void HTMLMediaElement::DecodeError()
   ReportLoadError("MediaLoadDecodeError", params, ArrayLength(params));
 
   if (mDecoder) {
     ShutdownDecoder();
   }
   RemoveMediaElementFromURITable();
   mLoadingSrc = nullptr;
   mMediaSource = nullptr;
+  AudioTracks()->EmptyTracks();
+  VideoTracks()->EmptyTracks();
   if (mIsLoadingFromSourceChildren) {
     mError = nullptr;
     if (mSourceLoadCandidate) {
       DispatchAsyncSourceError(mSourceLoadCandidate);
       QueueLoadFromSourceTask();
     } else {
       NS_WARNING("Should know the source we were loading from!");
     }