corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 24c0074052e6 (bug 1224936) for incoming mulet bustage

Browse Source
This commit is contained in:
Wes Kocher
2015-11-20 17:09:44 -08:00
parent 537fb2b766
commit 361842c001
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dom/html/HTMLMediaElement.cpp
View File

@@ -786,7 +786,6 @@ void HTMLMediaElement::NoSupportedMediaSourceError()
ChangeNetworkState(nsIDOMHTMLMediaElement::NETWORK_NO_SOURCE); ChangeNetworkState(nsIDOMHTMLMediaElement::NETWORK_NO_SOURCE);
DispatchAsyncEvent(NS_LITERAL_STRING("error")); DispatchAsyncEvent(NS_LITERAL_STRING("error"));
ChangeDelayLoadStatus(false); ChangeDelayLoadStatus(false);
UpdateAudioChannelPlayingState();
} }
typedef void (HTMLMediaElement::*SyncSectionFn)(); typedef void (HTMLMediaElement::*SyncSectionFn)();
@@ -3531,7 +3530,6 @@ void HTMLMediaElement::Error(uint16_t aErrorCode)
ChangeNetworkState(nsIDOMHTMLMediaElement::NETWORK_IDLE); ChangeNetworkState(nsIDOMHTMLMediaElement::NETWORK_IDLE);
} }
ChangeDelayLoadStatus(false); ChangeDelayLoadStatus(false);
UpdateAudioChannelPlayingState();
} }
void HTMLMediaElement::PlaybackEnded() void HTMLMediaElement::PlaybackEnded()
@@ -4758,11 +4756,6 @@ HTMLMediaElement::IsPlayingThroughTheAudioChannel() const
return false; return false;
} }
// If we have an error, we are not playing.
if (mError) {
return false;
}
// The volume should not be ~0 // The volume should not be ~0
if (std::fabs(Volume()) <= 1e-7) { if (std::fabs(Volume()) <= 1e-7) {
return false; return false;