Backed out changeset ce6b4f84c86e (bug 1289976)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Sat, 30 Jul 2016 19:52:29 +0200
changeset 349562 055698b4f81dd9ee93e74babb82329622d8ccc1c
parent 349561 3bc17ae80dc861d720e91cd67f6b3ecd84ddcbf6
child 349563 98c45193a812eaa06fb2086d33ba5bd7c1f580cb
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1289976
milestone50.0a1
backs outce6b4f84c86eb60cd384014b183aae50845be0b0
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset ce6b4f84c86e (bug 1289976)
dom/media/MediaDecoder.cpp
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -1887,17 +1887,20 @@ MediaDecoder::ConstructMediaTracks()
     track->SetEnabledInternal(info.mEnabled, MediaTrack::FIRE_NO_EVENTS);
   }
 }
 
 void
 MediaDecoder::RemoveMediaTracks()
 {
   MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(!IsShutdown());
+
+  if (IsShutdown()) {
+    return;
+  }
 
   HTMLMediaElement* element = mOwner->GetMediaElement();
   if (!element) {
     return;
   }
 
   AudioTrackList* audioList = element->AudioTracks();
   if (audioList) {