Backed out changeset 2931db85cc99 (bug 1289976)

dom/media/MediaDecoder.cpp

@@ -386,11 +386,16 @@ void
 MediaDecoder::StartDormantTimer()
 {
   MOZ_ASSERT(NS_IsMainThread());
+  if (!IsHeuristicDormantSupported()) {
+    return;
+  }
 
-  if (!IsHeuristicDormantSupported() ||
-      mIsHeuristicDormant ||
+  if (mIsHeuristicDormant ||
+      IsShutdown() ||
       mIsVisible ||
-      (mPlayState != PLAY_STATE_PAUSED && !IsEnded())) {
+      (mPlayState != PLAY_STATE_PAUSED &&
+       !IsEnded()))
+  {
     return;
   }