зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1183495 - part2: Remove mozSrcObject in MediaElement. r=jwwang
MozReview-Commit-ID: 2bmYnu2RDdt --HG-- extra : rebase_source : e6abd85f933463d2dfe73528c63be8736d2a1577
This commit is contained in:
Родитель
4e5c6bb79d
Коммит
35226e578f
|
@ -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<DOMMediaStream>
|
||||
HTMLMediaElement::GetMozSrcObject() const
|
||||
{
|
||||
NS_ASSERTION(!mSrcAttrStream || mSrcAttrStream->GetPlaybackStream(),
|
||||
"MediaStream should have been set up properly");
|
||||
RefPtr<DOMMediaStream> 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;
|
||||
|
|
|
@ -644,11 +644,6 @@ public:
|
|||
void SetSrcObject(DOMMediaStream& aValue);
|
||||
void SetSrcObject(DOMMediaStream* aValue);
|
||||
|
||||
// TODO: remove prefixed versions soon (1183495).
|
||||
already_AddRefed<DOMMediaStream> GetMozSrcObject() const;
|
||||
void SetMozSrcObject(DOMMediaStream& aValue);
|
||||
void SetMozSrcObject(DOMMediaStream* aValue);
|
||||
|
||||
bool MozPreservesPitch() const
|
||||
{
|
||||
return mPreservesPitch;
|
||||
|
|
Загрузка…
Ссылка в новой задаче