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

Backed out 4 changesets (bug 1527925, bug 1545168, bug 1539567) for failing at /actions/test_media.html on a CLOSED TREE. 

Backed out changeset a55e5c83e32e (bug 1527925)
Backed out changeset 45d19d0692b2 (bug 1539567)
Backed out changeset d418d95454eb (bug 1527925)
Backed out changeset a37009048470 (bug 1545168)
This commit is contained in:
Gurzau Raul 2019-04-18 05:09:03 +03:00
Родитель 1fd9b49041
Коммит b2185e6c29
3 изменённых файлов: 5 добавлений и 137 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
browser/base/content/nsContextMenu.js
Просмотреть файл

@ -715,8 +715,6 @@ nsContextMenu.prototype = {
this.setItemAttr("context-video-saveimage", "disabled", !canSaveSnapshot);
this.setItemAttr("context-video-fullscreen", "disabled", hasError);
this.setItemAttr("context-video-pictureinpicture", "checked", this.onPiPVideo);
this.setItemAttr("context-video-pictureinpicture", "disabled",
!this.onPiPVideo && hasError);
}
}
this.showItem("context-media-sep-commands", onMedia);

125
browser/base/content/test/general/browser_contextmenu.js
Просмотреть файл

@ -199,7 +199,6 @@ add_task(async function test_video_ok() {
await SpecialPowers.pushPrefEnv({
set: [["media.videocontrols.picture-in-picture.enabled", true]],
});
await test_contextmenu("#test-video-ok",
["context-media-play", true,
"context-media-mute", true,
@ -222,13 +221,8 @@ add_task(async function test_video_ok() {
"context-sendvideo", true,
]
);
await SpecialPowers.popPrefEnv();
await SpecialPowers.pushPrefEnv({
set: [["media.videocontrols.picture-in-picture.enabled", false]],
});
await test_contextmenu("#test-video-ok",
["context-media-play", true,
"context-media-mute", true,
@ -250,8 +244,6 @@ add_task(async function test_video_ok() {
"context-sendvideo", true,
]
);
await SpecialPowers.popPrefEnv();
});
add_task(async function test_audio_in_video() {
@ -276,39 +268,6 @@ add_task(async function test_audio_in_video() {
});
add_task(async function test_video_bad() {
await SpecialPowers.pushPrefEnv({
set: [["media.videocontrols.picture-in-picture.enabled", true]],
});
await test_contextmenu("#test-video-bad",
["context-media-play", false,
"context-media-mute", false,
"context-media-playbackrate", null,
["context-media-playbackrate-050x", false,
"context-media-playbackrate-100x", false,
"context-media-playbackrate-125x", false,
"context-media-playbackrate-150x", false,
"context-media-playbackrate-200x", false], null,
"context-media-loop", true,
"context-media-hidecontrols", false,
"context-video-fullscreen", false,
"context-video-pictureinpicture", false,
"---", null,
"context-viewvideo", true,
"context-copyvideourl", true,
"---", null,
"context-savevideo", true,
"context-video-saveimage", false,
"context-sendvideo", true,
]
);
await SpecialPowers.popPrefEnv();
await SpecialPowers.pushPrefEnv({
set: [["media.videocontrols.picture-in-picture.enabled", false]],
});
await test_contextmenu("#test-video-bad",
["context-media-play", false,
"context-media-mute", false,
@ -330,44 +289,9 @@ add_task(async function test_video_bad() {
"context-sendvideo", true,
]
);
await SpecialPowers.popPrefEnv();
});
add_task(async function test_video_bad2() {
await SpecialPowers.pushPrefEnv({
set: [["media.videocontrols.picture-in-picture.enabled", true]],
});
await test_contextmenu("#test-video-bad2",
["context-media-play", false,
"context-media-mute", false,
"context-media-playbackrate", null,
["context-media-playbackrate-050x", false,
"context-media-playbackrate-100x", false,
"context-media-playbackrate-125x", false,
"context-media-playbackrate-150x", false,
"context-media-playbackrate-200x", false], null,
"context-media-loop", true,
"context-media-hidecontrols", false,
"context-video-fullscreen", false,
"context-video-pictureinpicture", false,
"---", null,
"context-viewvideo", false,
"context-copyvideourl", false,
"---", null,
"context-savevideo", false,
"context-video-saveimage", false,
"context-sendvideo", false,
]
);
await SpecialPowers.popPrefEnv();
await SpecialPowers.pushPrefEnv({
set: [["media.videocontrols.picture-in-picture.enabled", false]],
});
await test_contextmenu("#test-video-bad2",
["context-media-play", false,
"context-media-mute", false,
@ -389,8 +313,6 @@ add_task(async function test_video_bad2() {
"context-sendvideo", false,
]
);
await SpecialPowers.popPrefEnv();
});
add_task(async function test_iframe() {
@ -430,51 +352,6 @@ add_task(async function test_iframe() {
});
add_task(async function test_video_in_iframe() {
await SpecialPowers.pushPrefEnv({
set: [["media.videocontrols.picture-in-picture.enabled", true]],
});
await test_contextmenu("#test-video-in-iframe",
["context-media-play", true,
"context-media-mute", true,
"context-media-playbackrate", null,
["context-media-playbackrate-050x", true,
"context-media-playbackrate-100x", true,
"context-media-playbackrate-125x", true,
"context-media-playbackrate-150x", true,
"context-media-playbackrate-200x", true], null,
"context-media-loop", true,
"context-media-hidecontrols", true,
"context-video-fullscreen", true,
"context-video-pictureinpicture", true,
"---", null,
"context-viewvideo", true,
"context-copyvideourl", true,
"---", null,
"context-savevideo", true,
"context-video-saveimage", true,
"context-sendvideo", true,
"frame", null,
["context-showonlythisframe", true,
"context-openframeintab", true,
"context-openframe", true,
"---", null,
"context-reloadframe", true,
"---", null,
"context-bookmarkframe", true,
"context-saveframe", true,
"---", null,
"context-printframe", true,
"---", null,
"context-viewframeinfo", true], null]
);
await SpecialPowers.popPrefEnv();
await SpecialPowers.pushPrefEnv({
set: [["media.videocontrols.picture-in-picture.enabled", false]],
});
await test_contextmenu("#test-video-in-iframe",
["context-media-play", true,
"context-media-mute", true,
@ -508,8 +385,6 @@ add_task(async function test_video_in_iframe() {
"---", null,
"context-viewframeinfo", true], null]
);
await SpecialPowers.popPrefEnv();
});
add_task(async function test_audio_in_iframe() {

15
modules/libpref/init/all.js
Просмотреть файл

@ -426,16 +426,6 @@ pref("media.decoder-doctor.verbose", false);
// URL to report decode issues
pref("media.decoder-doctor.new-issue-endpoint", "https://webcompat.com/issues/new");
#if defined(NIGHTLY_BUILD) && defined(XP_WIN)
pref("media.videocontrols.picture-in-picture.enabled", true);
pref("media.videocontrols.picture-in-picture.video-toggle.enabled", true);
#else
pref("media.videocontrols.picture-in-picture.enabled", false);
pref("media.videocontrols.picture-in-picture.video-toggle.enabled", false);
#endif
pref("media.videocontrols.picture-in-picture.video-toggle.flyout-enabled", false);
pref("media.videocontrols.picture-in-picture.video-toggle.flyout-wait-ms", 5000);
#ifdef MOZ_WEBRTC
pref("media.navigator.enabled", true);
pref("media.navigator.video.enabled", true);
@ -455,6 +445,11 @@ pref("media.peerconnection.sdp.rust.enabled", false);
pref("media.peerconnection.sdp.rust.compare", false);
#endif
pref("media.videocontrols.picture-in-picture.enabled", false);
pref("media.videocontrols.picture-in-picture.video-toggle.enabled", false);
pref("media.videocontrols.picture-in-picture.video-toggle.flyout-enabled", false);
pref("media.videocontrols.picture-in-picture.video-toggle.flyout-wait-ms", 5000);
pref("media.webrtc.debug.trace_mask", 0);
pref("media.webrtc.debug.multi_log", false);
pref("media.webrtc.debug.log_file", "");