mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1627999 - part6 : modify 'test_trigger_actionhanlder.html'. r=bryce 

This patch will do :
- play media from different frame, rather than alway playing media from the main frame

The advantage of doing so :
- to make the media session in child frame become the active media session because that can only be the context with the audio focus

Differential Revision: https://phabricator.services.mozilla.com/D72500
This commit is contained in:
alwu 2020-05-15 21:49:54 +00:00
Родитель b37d0955bb
Коммит fa7fe1ff9d
2 изменённых файлов: 50 добавлений и 17 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

24
dom/media/mediasession/test/file_trigger_actionhanlder_frame.html
Просмотреть файл

@ -5,11 +5,33 @@
<script src="MediaSessionTestUtils.js"></script>
</head>
<body>
<video id="testVideo" src="gizmo.mp4" loop></video>
<script>
const video = document.getElementById("testVideo");
const w = window.opener || window.parent;
window.onmessage = async event => {
if (event.data == "play") {
await video.play();
// As we can't observe `media-displayed-playback-changed` notification,
// that can only be observed in the chrome process. Therefore, we use a
// workaround instead which is to wait for a while to ensure that the
// controller has already been created in the chrome process.
let timeupdatecount = 0;
await new Promise(r => video.ontimeupdate = () => {
if (++timeupdatecount == 3) {
video.ontimeupdate = null;
r();
}
});
w.postMessage("played", "*");
}
}
// Setup the action handlers which would post the result back to the main window.
for (const action of gMediaSessionActions) {
navigator.mediaSession.setActionHandler(action, () => {
const w = window.opener || window.parent;
w.postMessage(action, "*");
});
}

43
dom/media/mediasession/test/file_trigger_actionhanlder_window.html
Просмотреть файл

@ -15,11 +15,11 @@ var triggeredActionNums = 0;
nextWindowMessage().then(
async (event) => {
const testInfo = event.data;
await createSession(testInfo);
// Media session would only become active if there is any media currently
// playing. Non-active media session won't receive any actions. Therefore,
// we start media playback before testing media session.
await startMediaPlayback();
await createSession(testInfo);
await startMediaPlayback(testInfo);
for (const action of gMediaSessionActions) {
await waitUntilActionHandlerTriggered(action, testInfo);
}
@ -29,21 +29,32 @@ nextWindowMessage().then(
/**
* The following are helper functions
*/
async function startMediaPlayback() {
async function startMediaPlayback({shouldCreateFrom}) {
info(`wait until media starts playing`);
const video = document.getElementById("testVideo");
await video.play();
// As we can't observe `main-media-controller-playback-changed` notification,
// which can only be observed in the chrome process. Therefore, we use a
// workaround instead which is to wait for a while to ensure that the
// controller has already been created in the chrome process.
let timeupdatecount = 0;
await new Promise(r => video.ontimeupdate = () => {
if (++timeupdatecount == 3) {
video.ontimeupdate = null;
r();
}
});
if (shouldCreateFrom == "main-frame") {
const video = document.getElementById("testVideo");
await video.play();
// As we can't observe `media-displayed-playback-changed` notification,
// that can only be observed in the chrome process. Therefore, we use a
// workaround instead which is to wait for a while to ensure that the
// controller has already been created in the chrome process.
let timeupdatecount = 0;
await new Promise(r => video.ontimeupdate = () => {
if (++timeupdatecount == 3) {
video.ontimeupdate = null;
r();
}
});
} else {
const iframe = document.getElementById("childFrame");
iframe.contentWindow.postMessage("play", "*");
await new Promise(r => {
window.onmessage = event => {
is(event.data, "played", `media started playing in child-frame`);
r();
};
});
}
}
async function createSession({shouldCreateFrom, origin}) {