Backed out 5 changesets (bug 1345403) for permanent failure in autophone Mdm tests
Backed out changeset f6415ae0ba89 (bug 1345403) Backed out changeset ac12e246a808 (bug 1345403) Backed out changeset a3e4ce12194f (bug 1345403) Backed out changeset ba072186c917 (bug 1345403) Backed out changeset 7a7d6e9b8329 (bug 1345403)
This commit is contained in:
@@ -1527,33 +1527,6 @@ HTMLMediaElement::SetVisible(bool aVisible)
|
||||
mDecoder->SetForcedHidden(!aVisible);
|
||||
}
|
||||
|
||||
layers::Image*
|
||||
HTMLMediaElement::GetCurrentImage()
|
||||
{
|
||||
// Mark the decoder owned by the element as tainted so that the
|
||||
// suspend-vide-decoder is suspended.
|
||||
mHasSuspendTaint = true;
|
||||
if (mDecoder) {
|
||||
mDecoder->SetSuspendTaint(true);
|
||||
}
|
||||
|
||||
// TODO: In bug 1345404, handle case when video decoder is already suspended.
|
||||
ImageContainer* container = GetImageContainer();
|
||||
if (!container) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
AutoLockImage lockImage(container);
|
||||
return lockImage.GetImage();
|
||||
}
|
||||
|
||||
bool
|
||||
HTMLMediaElement::HasSuspendTaint() const
|
||||
{
|
||||
MOZ_ASSERT(!mDecoder || (mDecoder->HasSuspendTaint() == mHasSuspendTaint));
|
||||
return mHasSuspendTaint;
|
||||
}
|
||||
|
||||
already_AddRefed<DOMMediaStream>
|
||||
HTMLMediaElement::GetSrcObject() const
|
||||
{
|
||||
@@ -3719,7 +3692,6 @@ HTMLMediaElement::HTMLMediaElement(already_AddRefed<mozilla::dom::NodeInfo>& aNo
|
||||
mFirstFrameLoaded(false),
|
||||
mDefaultPlaybackStartPosition(0.0),
|
||||
mIsAudioTrackAudible(false),
|
||||
mHasSuspendTaint(false),
|
||||
mVisibilityState(Visibility::APPROXIMATELY_NONVISIBLE),
|
||||
mErrorSink(new ErrorSink(this)),
|
||||
mAudioChannelWrapper(new AudioChannelAgentCallback(this, mAudioChannel))
|
||||
@@ -4717,8 +4689,6 @@ nsresult HTMLMediaElement::FinishDecoderSetup(MediaDecoder* aDecoder,
|
||||
if (mPreloadAction == HTMLMediaElement::PRELOAD_METADATA) {
|
||||
mDecoder->SetMinimizePrerollUntilPlaybackStarts();
|
||||
}
|
||||
// Notify the decoder of suspend taint.
|
||||
mDecoder->SetSuspendTaint(mHasSuspendTaint);
|
||||
|
||||
// Update decoder principal before we start decoding, since it
|
||||
// can affect how we feed data to MediaStreams
|
||||
|
||||
Reference in New Issue
Block a user