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

Bug 1315858 - Test ability to detect screensharing sources that are firefox. r=florian,jesup 

MozReview-Commit-ID: K6Kkdaso7dd

--HG--
extra : rebase_source : 482d2802036e707997e3b72186e04489e2324dce
This commit is contained in:
Jan-Ivar Bruaroey 2016-11-07 12:20:41 -05:00
Родитель 6aad53fa96
Коммит e67d93e9ca
3 изменённых файлов: 64 добавлений и 1 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
dom/media/MediaManager.cpp
Просмотреть файл

@ -2300,7 +2300,8 @@ if (privileged) {
bool fake = c.mFake.WasPassed()? c.mFake.Value() :
Preferences::GetBool("media.navigator.streams.fake");
bool askPermission = !privileged &&
bool askPermission =
(!privileged || Preferences::GetBool("media.navigator.permission.force")) &&
(!fake || Preferences::GetBool("media.navigator.permission.fake"));
RefPtr<PledgeSourceSet> p = EnumerateDevicesImpl(windowID, videoType,

2
dom/media/tests/mochitest/mochitest.ini
Просмотреть файл

@ -73,6 +73,8 @@ skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulato
[test_getUserMedia_playAudioTwice.html]
[test_getUserMedia_playVideoAudioTwice.html]
[test_getUserMedia_playVideoTwice.html]
[test_getUserMedia_scarySources.html]
skip-if = toolkit == 'android' # no screenshare or windowshare on android
[test_getUserMedia_spinEventLoop.html]
[test_getUserMedia_stopAudioStream.html]
[test_getUserMedia_stopAudioStreamWithFollowupAudio.html]

60
dom/media/tests/mochitest/test_getUserMedia_scarySources.html Normal file
Просмотреть файл

@ -0,0 +1,60 @@
<!DOCTYPE HTML>
<html>
<head>
<script type="application/javascript" src="head.js"></script>
<script type="application/javascript" src="mediaStreamPlayback.js"></script>
</head>
<body>
<pre id="test">
<script type="application/javascript">
createHTML({title: "Detect screensharing sources that are firefox", bug: "1311048"});
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
const { Services } = SpecialPowers.Cu.import('resource://gre/modules/Services.jsm');
let observe = topic => new Promise(r => Services.obs.addObserver(function o(...args) {
Services.obs.removeObserver(o, topic);
r(args);
}, topic, false));
let getDevices = async constraints => {
let [{ windowID, innerWindowID, callID }] = await Promise.race([
getUserMedia(constraints),
observe("getUserMedia:request")
]);
let window = Services.wm.getOuterWindowWithId(windowID);
let devices = await new Promise((resolve, reject) =>
window.navigator.mozGetUserMediaDevices({}, resolve, reject,
innerWindowID, callID));
return devices.map(d => d.QueryInterface(Ci.nsIMediaDevice));
};
runTest(async () => {
try {
await pushPrefs(["media.navigator.permission.disabled", true],
["media.navigator.permission.fake", true],
["media.navigator.permission.force", true]);
let devices = await getDevices({video: { mediaSource: "window" }});
ok(devices.length, "Found one or more windows.");
devices = devices.filter(d => d.scary);
ok(devices.length, "Found one or more scary windows (our own counts).");
devices.filter(d => d.name.includes("MochiTest"));
ok(devices.length,
"Our own window is among the scary: " + devices.map(d => `"${d.name}"`));
devices = await getDevices({video: { mediaSource: "screen" }});
let numScreens = devices.length;
ok(numScreens, "Found one or more screens.");
devices = devices.filter(d => d.scary);
is(devices.length, numScreens, "All screens are scary.");
} catch(e) {
ok(false, e);
}
});
</script>
</pre>
</body>
</html>