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

Merge mozilla-central to mozilla-inbound

Browse Source
This commit is contained in:
Dorel Luca
2018-05-03 13:03:06 +03:00
parent a08ce6e90a 6d4c3fed3a
commit 85a9a93e8f
396 changed files with 3353 additions and 1354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dom/html/HTMLMediaElement.cpp
View File

@@ -4052,20 +4052,7 @@ HTMLMediaElement::PlayInternal(ErrorResult& aRv)
// starting playback until we've loaded metadata.
mAttemptPlayUponLoadedMetadata = true;
} else {
nsresult rv = mDecoder->Play();
if (NS_FAILED(rv)) {
// We don't need to remove the _promise_ from _mPendingPlayPromises_ here.
// If something wrong between |mPendingPlayPromises.AppendElement(promise);|
// and here, the _promise_ should already have been rejected. Otherwise,
// the _promise_ won't be returned to JS at all, so just leave it in the
// _mPendingPlayPromises_ and let it be resolved/rejected with the
// following actions and the promise-resolution won't be observed at all.
LOG(LogLevel::Debug,
("%p Play() promise rejected because failed to play MediaDecoder.",
this));
promise->MaybeReject(rv);
return promise.forget();
}
mDecoder->Play();
}
}
} else if (mReadyState < HAVE_METADATA) {
@@ -4933,19 +4920,14 @@ HTMLMediaElement::FinishDecoderSetup(MediaDecoder* aDecoder)
mDecoder->Suspend();
}
nsresult rv = NS_OK;
if (!mPaused && !mAttemptPlayUponLoadedMetadata) {
SetPlayedOrSeeked(true);
if (!mPausedForInactiveDocumentOrChannel) {
rv = mDecoder->Play();
mDecoder->Play();
}
}
if (NS_FAILED(rv)) {
ShutdownDecoder();
}
return rv;
return NS_OK;
}
class HTMLMediaElement::StreamListener : public MediaStreamListener