Backed out changeset bac5f65e6931 (bug 1289976)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Sat, 30 Jul 2016 19:52:30 +0200
changeset 349563 98c45193a812eaa06fb2086d33ba5bd7c1f580cb
parent 349562 055698b4f81dd9ee93e74babb82329622d8ccc1c
child 349564 7b54c336bdf08df59a2252f8d494fa1450cf0333
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 outbac5f65e6931cfad3b138a92d4999658e45f5212
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 bac5f65e6931 (bug 1289976)
dom/media/MediaDecoder.cpp
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -416,17 +416,19 @@ MediaDecoder::CancelDormantTimer()
     mDormantTimer->Cancel();
   }
 }
 
 void
 MediaDecoder::Pause()
 {
   MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(!IsShutdown());
+  if (IsShutdown()) {
+    return;
+  }
   if (mPlayState == PLAY_STATE_LOADING || IsEnded()) {
     mNextState = PLAY_STATE_PAUSED;
     return;
   }
   ChangeState(PLAY_STATE_PAUSED);
 }
 
 void