Backed out changeset ba01eb85da0a (bug 1289976)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Sat, 30 Jul 2016 19:52:25 +0200
changeset 349558 75f47838f78d85f74e52566deca3badf506ca1a1
parent 349557 9e48f74f44c387f4601ba0aab3d651703183848f
child 349559 99165d03ee193c5494b135597197fe12e4a76c8b
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 outba01eb85da0a2b60d2061ef3ca06ac6f435d434f
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 ba01eb85da0a (bug 1289976)
dom/media/MediaDecoder.cpp
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -314,19 +314,19 @@ MediaDecoder::IsHeuristicDormantSupporte
 #endif
     mIsHeuristicDormantSupported;
 }
 
 void
 MediaDecoder::UpdateDormantState(bool aDormantTimeout, bool aActivity)
 {
   MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(!IsShutdown());
 
-  if (!mDecoderStateMachine ||
+  if (IsShutdown() ||
+      !mDecoderStateMachine ||
       !mOwner->GetVideoFrameContainer() ||
       (mOwner->GetMediaElement() && mOwner->GetMediaElement()->IsBeingDestroyed()) ||
       !mDormantSupported)
   {
     return;
   }
 
   DECODER_LOG("UpdateDormantState aTimeout=%d aActivity=%d mIsDormant=%d "