Backed out changeset 1c6c9a6c9b16 (bug 1321497) for failing browser_mediaPlayback_suspended_multipleAudio.js. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 01 Dec 2016 17:09:29 +0100
changeset 324945 b0b97ce213be8cf067558146079756b0bb610370
parent 324944 3d6357118c039ac6c96e6c37caa33f2024296b6f
child 324946 aa1833690db2659c17144b0d5e5b1900fe1a1af0
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersbackout
bugs1321497
milestone53.0a1
backs out1c6c9a6c9b16991dc4605aef989f1ae0c8ff8820
Backed out changeset 1c6c9a6c9b16 (bug 1321497) for failing browser_mediaPlayback_suspended_multipleAudio.js. r=backout
dom/html/HTMLMediaElement.cpp
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -765,17 +765,17 @@ private:
 
     NotifyAudioPlaybackChanged(
       AudioChannelService::AudibleChangedReasons::ePauseStateChanged);
   }
 
   void
   Resume()
   {
-    if (!IsSuspended() || !mOwner->Paused()) {
+    if (!IsSuspended() && mOwner->Paused()) {
       MOZ_LOG(AudioChannelService::GetAudioChannelLog(), LogLevel::Debug,
              ("HTMLMediaElement::AudioChannelAgentCallback, ResumeFromAudioChannel, "
               "this = %p, Error : resume without suspended!\n", this));
       return;
     }
 
     SetSuspended(nsISuspendedTypes::NONE_SUSPENDED);
     nsresult rv = mOwner->Play();