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

Bug 1452741. Stop using the no-arg DOMEventTargetHelper constructor in MediaTrack. r=bkelly

Browse Source 
MozReview-Commit-ID: AbE3XJdj4KO
This commit is contained in:
Boris Zbarsky
2018-04-11 10:27:00 -04:00
parent 6095241db8
commit d18e4f5af5
9 changed files with 50 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dom/html/HTMLMediaElement.cpp
View File

@@ -5233,26 +5233,30 @@ void HTMLMediaElement::EndSrcMediaStreamPlayback()
}
static already_AddRefed<AudioTrack>
CreateAudioTrack(AudioStreamTrack* aStreamTrack)
CreateAudioTrack(AudioStreamTrack* aStreamTrack,
nsIGlobalObject* aOwnerGlobal)
{
nsAutoString id;
nsAutoString label;
aStreamTrack->GetId(id);
aStreamTrack->GetLabel(label, CallerType::System);
return MediaTrackList::CreateAudioTrack(id, NS_LITERAL_STRING("main"),
return MediaTrackList::CreateAudioTrack(aOwnerGlobal,
id, NS_LITERAL_STRING("main"),
label, EmptyString(), true);
}
static already_AddRefed<VideoTrack>
CreateVideoTrack(VideoStreamTrack* aStreamTrack)
CreateVideoTrack(VideoStreamTrack* aStreamTrack,
nsIGlobalObject* aOwnerGlobal)
{
nsAutoString id;
nsAutoString label;
aStreamTrack->GetId(id);
aStreamTrack->GetLabel(label, CallerType::System);
return MediaTrackList::CreateVideoTrack(id, NS_LITERAL_STRING("main"),
return MediaTrackList::CreateVideoTrack(aOwnerGlobal,
id, NS_LITERAL_STRING("main"),
label, EmptyString(),
aStreamTrack);
}
@@ -5276,14 +5280,16 @@ HTMLMediaElement::NotifyMediaStreamTrackAdded(const RefPtr<MediaStreamTrack>& aT
#endif
if (AudioStreamTrack* t = aTrack->AsAudioStreamTrack()) {
RefPtr<AudioTrack> audioTrack = CreateAudioTrack(t);
RefPtr<AudioTrack> audioTrack =
CreateAudioTrack(t, AudioTracks()->GetOwnerGlobal());
AudioTracks()->AddTrack(audioTrack);
} else if (VideoStreamTrack* t = aTrack->AsVideoStreamTrack()) {
// TODO: Fix this per the spec on bug 1273443.
if (!IsVideo()) {
return;
}
RefPtr<VideoTrack> videoTrack = CreateVideoTrack(t);
RefPtr<VideoTrack> videoTrack =
CreateVideoTrack(t, VideoTracks()->GetOwnerGlobal());
VideoTracks()->AddTrack(videoTrack);
// New MediaStreamTrack added, set the new added video track as selected
// video track when there is no selected track.
@@ -7690,8 +7696,10 @@ HTMLMediaElement::ConstructMediaTracks(const MediaInfo* aInfo)
AudioTrackList* audioList = AudioTracks();
if (audioList && aInfo->HasAudio()) {
const TrackInfo& info = aInfo->mAudio;
RefPtr<AudioTrack> track = MediaTrackList::CreateAudioTrack(
info.mId, info.mKind, info.mLabel, info.mLanguage, info.mEnabled);
RefPtr<AudioTrack> track =
MediaTrackList::CreateAudioTrack(audioList->GetOwnerGlobal(), info.mId,
info.mKind, info.mLabel, info.mLanguage,
info.mEnabled);
audioList->AddTrack(track);
}
@@ -7699,8 +7707,9 @@ HTMLMediaElement::ConstructMediaTracks(const MediaInfo* aInfo)
VideoTrackList* videoList = VideoTracks();
if (videoList && aInfo->HasVideo()) {
const TrackInfo& info = aInfo->mVideo;
RefPtr<VideoTrack> track = MediaTrackList::CreateVideoTrack(
info.mId, info.mKind, info.mLabel, info.mLanguage);
RefPtr<VideoTrack> track =
MediaTrackList::CreateVideoTrack(videoList->GetOwnerGlobal(), info.mId,
info.mKind, info.mLabel, info.mLanguage);
videoList->AddTrack(track);
track->SetEnabledInternal(info.mEnabled, MediaTrack::FIRE_NO_EVENTS);