Backed out changeset e80105b6353d (bug 1402584)
This commit is contained in:
@@ -1913,12 +1913,6 @@ void HTMLMediaElement::QueueLoadFromSourceTask()
|
||||
return;
|
||||
}
|
||||
|
||||
if (mDecoder) {
|
||||
// Reset readyState to HAVE_NOTHING since we're going to load a new decoder.
|
||||
ShutdownDecoder();
|
||||
ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_NOTHING);
|
||||
}
|
||||
|
||||
ChangeDelayLoadStatus(true);
|
||||
ChangeNetworkState(nsIDOMHTMLMediaElement::NETWORK_LOADING);
|
||||
RefPtr<Runnable> r = NewRunnableMethod("HTMLMediaElement::LoadFromSourceChildren",
|
||||
@@ -4862,7 +4856,6 @@ HTMLMediaElement::InitializeDecoderAsClone(ChannelMediaDecoder* aOriginal)
|
||||
{
|
||||
NS_ASSERTION(mLoadingSrc, "mLoadingSrc must already be set");
|
||||
NS_ASSERTION(mDecoder == nullptr, "Shouldn't have a decoder");
|
||||
MOZ_DIAGNOSTIC_ASSERT(mReadyState == nsIDOMHTMLMediaElement::HAVE_NOTHING);
|
||||
|
||||
MediaDecoderInit decoderInit(this,
|
||||
mMuted ? 0.0 : mVolume,
|
||||
@@ -4916,7 +4909,6 @@ nsresult HTMLMediaElement::InitializeDecoderForChannel(nsIChannel* aChannel,
|
||||
nsIStreamListener** aListener)
|
||||
{
|
||||
NS_ASSERTION(mLoadingSrc, "mLoadingSrc must already be set");
|
||||
MOZ_DIAGNOSTIC_ASSERT(mReadyState == nsIDOMHTMLMediaElement::HAVE_NOTHING);
|
||||
|
||||
DecoderDoctorDiagnostics diagnostics;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user