Revision 8f1ef70886a1443ccd9980448031c88a44c3faea authored by Ben Pastene on 13 April 2018, 17:03:33 UTC, committed by Chromium WPT Sync on 13 April 2018, 17:03:33 UTC
This reverts commit 7c3d1d13f940e88ef6706fd8b5c257a81d340ed9. Reason for revert: WebviewLoginTest.Basic is still flaky on linux-chromeos-rel https://ci.chromium.org/buildbot/chromium.chromiumos/linux-chromeos-rel/6886 https://ci.chromium.org/buildbot/chromium.chromiumos/linux-chromeos-rel/6887 Original change's description: > Reland: Use PostTask to schedule cross-process postMessage forwarding. > > Changes from original attempt at https://crrev.com/c/999182: > - fix flakiness in two additional ChromeOS login tests > - fix CSP WPT tests to not depend on ordering between iframe's onload > and postMessage - see https://crbug.com/832319. > > Previously, we sent the IPC to forward a cross-process postMessage > immediately. This caused a behavioral difference from the > same-process case where the postMessage is always scheduled. Namely, > in a scenario like this: > > frame.postMessage(...); > doSomethingThatSendsIPCsToFrame(frame); > > the IPCs from JS following the postMessage would've been ordered > incorrectly, causing |frame| to see their side effects after the > postMessage dispatch in the cross-process case, whereas they would be > seen before the postMessage dispatch in the same-process case. One > example of this is frame.focus(), and another is a frame element > onload event (dispatched via FrameHostMsg_DispatchLoad) arriving after > a postMessage dispatched from an inline script while the frame was > still loading. > > To resolve these ordering concerns, this CL changes cross-process > postMessage to do a PostTask on the sender side before sending the > message to the browser process. This improves the current state of > the world, but does not yet achieve a perfect match for the IPC > ordering in the same-process case - see discussion on the bug. > > Bug: 828529 > Change-Id: I62a627c501526d09900be4f5bd2c899acf4d1e07 > Reviewed-on: https://chromium-review.googlesource.com/999182 > Reviewed-by: Xiyuan Xia <xiyuan@chromium.org> > Reviewed-by: Daniel Cheng <dcheng@chromium.org> > Commit-Queue: Alex Moshchuk <alexmos@chromium.org> > Cr-Original-Commit-Position: refs/heads/master@{#550284} > Reviewed-on: https://chromium-review.googlesource.com/1011287 > Cr-Commit-Position: refs/heads/master@{#550621} TBR=xiyuan@chromium.org,dcheng@chromium.org,alexmos@chromium.org Change-Id: Ic0637a6038bed6e5334a26e1934bee81faad3b9e No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 828529 Reviewed-on: https://chromium-review.googlesource.com/1012138 Reviewed-by: Ben Pastene <bpastene@chromium.org> Commit-Queue: Ben Pastene <bpastene@chromium.org> Cr-Commit-Position: refs/heads/master@{#550649}
1 parent 1e5a5fe
RTCDTMFSender-insertDTMF.https.html
<!doctype html>
<meta charset=utf-8>
<title>RTCDTMFSender.prototype.insertDTMF</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="RTCPeerConnection-helper.js"></script>
<script src="RTCDTMFSender-helper.js"></script>
<script>
'use strict';
// Test is based on the following editor draft:
// https://w3c.github.io/webrtc-pc/archives/20170605/webrtc.html
// The following helper functions are called from RTCPeerConnection-helper.js
// generateAnswer
// The following helper functions are called from RTCDTMFSender-helper.js
// createDtmfSender
// test_tone_change_events
// getTransceiver
/*
7. Peer-to-peer DTMF
partial interface RTCRtpSender {
readonly attribute RTCDTMFSender? dtmf;
};
interface RTCDTMFSender : EventTarget {
void insertDTMF(DOMString tones,
optional unsigned long duration = 100,
optional unsigned long interToneGap = 70);
attribute EventHandler ontonechange;
readonly attribute DOMString toneBuffer;
};
*/
/*
7.2. insertDTMF
The tones parameter is treated as a series of characters.
The characters 0 through 9, A through D, #, and * generate the associated
DTMF tones.
The characters a to d MUST be normalized to uppercase on entry and are
equivalent to A to D.
As noted in [RTCWEB-AUDIO] Section 3, support for the characters 0 through 9,
A through D, #, and * are required.
The character ',' MUST be supported, and indicates a delay of 2 seconds
before processing the next character in the tones parameter.
All other characters (and only those other characters) MUST be considered
unrecognized.
*/
promise_test(t => {
return createDtmfSender()
.then(dtmfSender => {
dtmfSender.insertDTMF('');
dtmfSender.insertDTMF('012345689');
dtmfSender.insertDTMF('ABCD');
dtmfSender.insertDTMF('abcd');
dtmfSender.insertDTMF('#*');
dtmfSender.insertDTMF(',');
dtmfSender.insertDTMF('0123456789ABCDabcd#*,');
});
}, 'insertDTMF() should succeed if tones contains valid DTMF characters');
/*
7.2. insertDTMF
6. If tones contains any unrecognized characters, throw an
InvalidCharacterError.
*/
promise_test(t => {
return createDtmfSender()
.then(dtmfSender => {
assert_throws('InvalidCharacterError', () =>
// 'F' is invalid
dtmfSender.insertDTMF('123FFABC'));
assert_throws('InvalidCharacterError', () =>
// 'E' is invalid
dtmfSender.insertDTMF('E'));
assert_throws('InvalidCharacterError', () =>
// ' ' is invalid
dtmfSender.insertDTMF('# *'));
});
}, 'insertDTMF() should throw InvalidCharacterError if tones contains invalid DTMF characters');
/*
7.2. insertDTMF
3. If transceiver.stopped is true, throw an InvalidStateError.
*/
test(t => {
const pc = new RTCPeerConnection();
const transceiver = pc.addTransceiver('audio');
const dtmfSender = transceiver.sender.dtmf;
transceiver.stop();
assert_throws('InvalidStateError', () => dtmfSender.insertDTMF(''));
}, 'insertDTMF() should throw InvalidStateError if transceiver is stopped');
/*
7.2. insertDTMF
4. If transceiver.currentDirection is recvonly or inactive, throw an InvalidStateError.
*/
promise_test(t => {
const pc = new RTCPeerConnection();
const transceiver = pc.addTransceiver('audio', {
direction: 'recvonly'
});
const dtmfSender = transceiver.sender.dtmf;
return pc.createOffer()
.then(offer =>
pc.setLocalDescription(offer)
.then(() => generateAnswer(offer)))
.then(() => {
assert_equals(transceiver.currentDirection, 'inactive');
assert_throws('InvalidStateError', () => dtmfSender.insertDTMF(''));
});
}, 'insertDTMF() should throw InvalidStateError if transceiver.currentDirection is recvonly');
promise_test(t => {
const pc = new RTCPeerConnection();
const transceiver = pc.addTransceiver('audio', {
direction: 'inactive'
});
const dtmfSender = transceiver.sender.dtmf;
return pc.createOffer()
.then(offer =>
pc.setLocalDescription(offer)
.then(() => generateAnswer(offer)))
.then(() => {
assert_equals(transceiver.currentDirection, 'inactive');
assert_throws('InvalidStateError', () => dtmfSender.insertDTMF(''));
});
}, 'insertDTMF() should throw InvalidStateError if transceiver.currentDirection is inactive');
/*
7.2. insertDTMF
The characters a to d MUST be normalized to uppercase on entry and are
equivalent to A to D.
7. Set the object's toneBuffer attribute to tones.
*/
promise_test(() => {
return createDtmfSender()
.then(dtmfSender => {
dtmfSender.insertDTMF('123');
assert_equals(dtmfSender.toneBuffer, '123');
dtmfSender.insertDTMF('ABC');
assert_equals(dtmfSender.toneBuffer, 'ABC');
dtmfSender.insertDTMF('bcd');
assert_equals(dtmfSender.toneBuffer, 'BCD');
});
}, 'insertDTMF() should set toneBuffer to provided tones normalized, with old tones overridden');
promise_test(t => {
let dtmfSender;
let sender;
let pc = new RTCPeerConnection();
return getTrackFromUserMedia('audio')
.then(([track, mediaStream]) => {
sender = pc.addTrack(track, mediaStream);
return pc.createOffer();
}).then(offer => {
pc.setLocalDescription(offer);
dtmfSender = sender.dtmf;
pc.removeTrack(sender);
pc.close();
assert_throws('InvalidStateError', () =>
dtmfSender.insertDTMF('123'));
});
}, 'insertDTMF() after remove and close should reject');
</script>
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...