From 30cc8665441763cc53461bcbd021ac1fb3660a96 Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Fri, 20 Nov 2015 17:09:44 -0800 Subject: [PATCH] Backed out changeset 24c0074052e6 (bug 1224936) for incoming mulet bustage --HG-- extra : commitid : CTB4L0oz2Q5 --- dom/html/HTMLMediaElement.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp index a288868910e8..06df311970ee 100644 --- a/dom/html/HTMLMediaElement.cpp +++ b/dom/html/HTMLMediaElement.cpp @@ -786,7 +786,6 @@ void HTMLMediaElement::NoSupportedMediaSourceError() ChangeNetworkState(nsIDOMHTMLMediaElement::NETWORK_NO_SOURCE); DispatchAsyncEvent(NS_LITERAL_STRING("error")); ChangeDelayLoadStatus(false); - UpdateAudioChannelPlayingState(); } typedef void (HTMLMediaElement::*SyncSectionFn)(); @@ -3531,7 +3530,6 @@ void HTMLMediaElement::Error(uint16_t aErrorCode) ChangeNetworkState(nsIDOMHTMLMediaElement::NETWORK_IDLE); } ChangeDelayLoadStatus(false); - UpdateAudioChannelPlayingState(); } void HTMLMediaElement::PlaybackEnded() @@ -4758,11 +4756,6 @@ HTMLMediaElement::IsPlayingThroughTheAudioChannel() const return false; } - // If we have an error, we are not playing. - if (mError) { - return false; - } - // The volume should not be ~0 if (std::fabs(Volume()) <= 1e-7) { return false;