wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1039666: Enable Screen/windowsharing tests for getUserMedia except OSX 10.6 and WinXP r=drno

Browse Source
This commit is contained in:
Randell Jesup 2014-08-02 00:30:39 -04:00
parent bb87f170e4
commit 7b5a99c59a
5 changed files with 59 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dom/media/tests/mochitest/head.js
View File

@ -133,7 +133,9 @@ function runTest(aCallback) {
['media.peerconnection.enabled', true],
['media.peerconnection.identity.enabled', true],
['media.peerconnection.identity.timeout', 12000],
['media.navigator.permission.disabled', true]]
['media.navigator.permission.disabled', true],
['media.getusermedia.screensharing.enabled', true],
['media.getusermedia.screensharing.allowed_domains', "mochi.test"]]
}, function () {
try {
aCallback();
@ -270,3 +272,19 @@ function unexpectedEventAndFinish(message, eventName) {
SimpleTest.finish();
}
}
function IsMacOSX10_6orOlder() {
var is106orOlder = false;
if (navigator.platform.indexOf("Mac") == 0) {
var version = Cc["@mozilla.org/system-info;1"]
.getService(SpecialPowers.Ci.nsIPropertyBag2)
.getProperty("version");
// the next line is correct: Mac OS 10.6 corresponds to Darwin version 10.x !
// Mac OS 10.7 is Darwin version 11.x. the |version| string we've got here
// is the Darwin version.
is106orOlder = (parseFloat(version) < 11.0);
}
return is106orOlder;
}

17
dom/media/tests/mochitest/test_getUserMedia_basicScreenshare.html
View File

@ -24,16 +24,19 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=983504
* cycle for an screenshare LocalMediaStream on a video HTMLMediaElement.
*/
runTest(function () {
const isWinXP = navigator.userAgent.indexOf("Windows NT 5.1") != -1;
if (IsMacOSX10_6orOlder() || isWinXP) {
ok(true, "Screensharing disabled for OSX10.6 and WinXP");
SimpleTest.finish();
return;
}
var testVideo = document.getElementById('testVideo');
var constraints = {
video: {
mandatory:{
chromeMediaSource:'screen',
maxWidth:screen.availWidth,
maxHeight:screen.availHeight
},
optional:[]
}
mozMediaSource: "screen",
mediaSource: "screen"
},
fake: false
};
getUserMedia(constraints, function (aStream) {

17
dom/media/tests/mochitest/test_getUserMedia_basicWindowshare.html
View File

@ -24,16 +24,19 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=983504
* cycle for an screenshare LocalMediaStream on a video HTMLMediaElement.
*/
runTest(function () {
const isWinXP = navigator.userAgent.indexOf("Windows NT 5.1") != -1;
if (IsMacOSX10_6orOlder() || isWinXP) {
ok(true, "Screensharing disabled for OSX10.6 and WinXP");
SimpleTest.finish();
return;
}
var testVideo = document.getElementById('testVideo');
var constraints = {
video: {
mandatory:{
chromeMediaSource:'window',
maxWidth:screen.availWidth,
maxHeight:screen.availHeight
},
optional:[]
}
mozMediaSource: "window",
mediaSource: "window"
},
fake: false
};
getUserMedia(constraints, function (aStream) {

17
dom/media/tests/mochitest/test_peerConnection_basicScreenshare.html
View File

@ -19,16 +19,19 @@
var test;
runNetworkTest(function (options) {
const isWinXP = navigator.userAgent.indexOf("Windows NT 5.1") != -1;
if (IsMacOSX10_6orOlder() || isWinXP) {
ok(true, "Screensharing disabled for OSX10.6 and WinXP");
SimpleTest.finish();
return;
}
test = new PeerConnectionTest(options);
var constraints = {
video: {
mandatory:{
chromeMediaSource:'screen',
maxWidth:screen.availWidth,
maxHeight:screen.availHeight
},
optional:[]
}
mozMediaSource: "screen",
mediaSource: "screen"
},
fake: false
};
test.setMediaConstraints([constraints], [constraints]);
test.run();

17
dom/media/tests/mochitest/test_peerConnection_basicWindowshare.html
View File

@ -19,16 +19,19 @@
var test;
runNetworkTest(function (options) {
const isWinXP = navigator.userAgent.indexOf("Windows NT 5.1") != -1;
if (IsMacOSX10_6orOlder() || isWinXP) {
ok(true, "Screensharing disabled for OSX10.6 and WinXP");
SimpleTest.finish();
return;
}
test = new PeerConnectionTest(options);
var constraints = {
video: {
mandatory:{
chromeMediaSource:'window',
maxWidth:screen.availWidth,
maxHeight:screen.availHeight
},
optional:[]
}
mozMediaSource: "window",
mediaSource: "window"
},
fake: false
};
test.setMediaConstraints([constraints], [constraints]);
test.run();