Backed out changeset 9966bbe6b534 (bug 1289976) for assertion failures in MediaDecoder.h
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Sat, 30 Jul 2016 19:52:46 +0200
changeset 349567 5469a910b4a1119e3a00394db6668e3bf6e72baf
parent 349566 1ea93130cc67ab6f2327776838915f5c39024076
child 349568 3b04c5fb4e57e684fd7ff59231c059ba650ab2b0
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 out9966bbe6b5349f00563cddfe52c3aead1c44a116
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 9966bbe6b534 (bug 1289976) for assertion failures in MediaDecoder.h
dom/media/MediaDecoder.cpp
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -1857,19 +1857,18 @@ MediaDecoder::GetOwner()
   // mOwner is valid until shutdown.
   return !IsShutdown() ? mOwner : nullptr;
 }
 
 void
 MediaDecoder::ConstructMediaTracks()
 {
   MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(!IsShutdown());
 
-  if (mMediaTracksConstructed || !mInfo) {
+  if (IsShutdown() || mMediaTracksConstructed || !mInfo) {
     return;
   }
 
   HTMLMediaElement* element = mOwner->GetMediaElement();
   if (!element) {
     return;
   }