Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #20278 - servo-wpt-sync:wpt_update_11-03-2018, r=jdm

Browse source 
Sync WPT with upstream (11-03-2018)

Automated downstream sync of changes from upstream as of 11-03-2018.
[no-wpt-sync]

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20278)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-03-11 23:15:55 -04:00 • committed by GitHub
commit 17d7a12ab4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/wpt/metadata/MANIFEST.json
View file

@ -601473,7 +601473,7 @@
"testharness" "testharness"
], ],
"webrtc/RTCDTMFSender-helper.js": [ "webrtc/RTCDTMFSender-helper.js": [
"79825a416ad8e027628e80c9e0ef1a8dca2d8ca3", "26b5336881897c93fafd1ddf32910cf6fef16987",
"support" "support"
], ],
"webrtc/RTCDTMFSender-insertDTMF.https.html": [ "webrtc/RTCDTMFSender-insertDTMF.https.html": [

14
tests/wpt/web-platform-tests/webrtc/RTCDTMFSender-helper.js
View file

@ -14,7 +14,7 @@
// Connect the PeerConnection to another PC and wait until it is // Connect the PeerConnection to another PC and wait until it is
// properly connected, so that DTMF can be sent. // properly connected, so that DTMF can be sent.
function createDtmfSender(pc = new RTCPeerConnection()) { function createDtmfSender(pc = new RTCPeerConnection()) {
var dtmfSender; let dtmfSender;
return getTrackFromUserMedia('audio') return getTrackFromUserMedia('audio')
.then(([track, mediaStream]) => { .then(([track, mediaStream]) => {
const sender = pc.addTrack(track, mediaStream); const sender = pc.addTrack(track, mediaStream);
@ -28,6 +28,9 @@ function createDtmfSender(pc = new RTCPeerConnection()) {
exchangeIceCandidates(pc, pc2); exchangeIceCandidates(pc, pc2);
return doSignalingHandshake(pc, pc2); return doSignalingHandshake(pc, pc2);
}).then(() => { }).then(() => {
if (!('canInsertDTMF' in dtmfSender)) {
return Promise.resolve();
}
// Wait until dtmfSender.canInsertDTMF becomes true. // Wait until dtmfSender.canInsertDTMF becomes true.
// Up to 150 ms has been observed in test. Wait 1 second // Up to 150 ms has been observed in test. Wait 1 second
// in steps of 10 ms. // in steps of 10 ms.
@ -35,7 +38,7 @@ function createDtmfSender(pc = new RTCPeerConnection()) {
// make test return a clear error message on failure. // make test return a clear error message on failure.
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let counter = 0; let counter = 0;
let checkfunc = function() { step_timeout(function checkCanInsertDTMF() {
if (dtmfSender.canInsertDTMF) { if (dtmfSender.canInsertDTMF) {
resolve(); resolve();
} else { } else {
@ -44,14 +47,11 @@ function createDtmfSender(pc = new RTCPeerConnection()) {
return; return;
} }
++counter; ++counter;
step_timeout(checkfunc, 10); step_timeout(checkCanInsertDTMF, 10);
} }
}; }, 0);
checkfunc();
}); });
}).then(() => { }).then(() => {
assert_true(dtmfSender.canInsertDTMF,
'Failed to create usable dtmfSender:');
return dtmfSender; return dtmfSender;
}); });
} }