diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp index b569b43b7aad..d04b65513532 100644 --- a/dom/html/HTMLMediaElement.cpp +++ b/dom/html/HTMLMediaElement.cpp @@ -1653,7 +1653,7 @@ HTMLMediaElement::GetSrcObject() const void HTMLMediaElement::SetSrcObject(DOMMediaStream& aValue) { - SetMozSrcObject(&aValue); + SetSrcObject(&aValue); } void @@ -1664,31 +1664,6 @@ HTMLMediaElement::SetSrcObject(DOMMediaStream* aValue) DoLoad(); } -// TODO: Remove prefixed versions soon (1183495) - -already_AddRefed -HTMLMediaElement::GetMozSrcObject() const -{ - NS_ASSERTION(!mSrcAttrStream || mSrcAttrStream->GetPlaybackStream(), - "MediaStream should have been set up properly"); - RefPtr stream = mSrcAttrStream; - return stream.forget(); -} - -void -HTMLMediaElement::SetMozSrcObject(DOMMediaStream& aValue) -{ - SetMozSrcObject(&aValue); -} - -void -HTMLMediaElement::SetMozSrcObject(DOMMediaStream* aValue) -{ - mSrcAttrStream = aValue; - UpdateAudioChannelPlayingState(); - DoLoad(); -} - NS_IMETHODIMP HTMLMediaElement::GetMozAutoplayEnabled(bool *aAutoplayEnabled) { *aAutoplayEnabled = mAutoplayEnabled; diff --git a/dom/html/HTMLMediaElement.h b/dom/html/HTMLMediaElement.h index bf187aa3f15f..787e26b72cbb 100644 --- a/dom/html/HTMLMediaElement.h +++ b/dom/html/HTMLMediaElement.h @@ -644,11 +644,6 @@ public: void SetSrcObject(DOMMediaStream& aValue); void SetSrcObject(DOMMediaStream* aValue); - // TODO: remove prefixed versions soon (1183495). - already_AddRefed GetMozSrcObject() const; - void SetMozSrcObject(DOMMediaStream& aValue); - void SetMozSrcObject(DOMMediaStream* aValue); - bool MozPreservesPitch() const { return mPreservesPitch;