Bug 1197022 - [EME] Disable dormant mode for EME videos on all channels. r=kentuckyfriedtakahe, a=sledru
authorChris Pearce <cpearce@mozilla.com>
Fri, 21 Aug 2015 13:34:21 +1200
changeset 277416 37782988982967c5db047812518096d893e11f9f
parent 277415 78ae41f10944bc1970ade072568d524a0f8361a7
child 277417 a3ee615760e96ec70672453a4a5880a256b1d826
push id8364
push userryanvm@gmail.com
push dateMon, 31 Aug 2015 12:16:24 +0000
treeherdermozilla-aurora@af82d216ded7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskentuckyfriedtakahe, sledru
bugs1197022
milestone42.0a2
Bug 1197022 - [EME] Disable dormant mode for EME videos on all channels. r=kentuckyfriedtakahe, a=sledru
dom/media/MediaDecoder.cpp
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -156,19 +156,18 @@ void MediaDecoder::NotifyOwnerActivityCh
   // Start dormant timer if necessary
   StartDormantTimer();
 }
 
 bool
 MediaDecoder::IsHeuristicDormantSupported() const
 {
   return
-#if defined(MOZ_EME) && defined(RELEASE_BUILD)
-    // We disallow dormant for encrypted media on Beta and Release until
-    // bug 1181864 is fixed.
+#if defined(MOZ_EME)
+    // We disallow dormant for encrypted media until bug 1181864 is fixed.
     mInfo &&
     !mInfo->IsEncrypted() &&
 #endif
     mIsHeuristicDormantSupported;
 }
 
 void MediaDecoder::UpdateDormantState(bool aDormantTimeout, bool aActivity)
 {