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

Bug 1091898 - restore exception-handling around legacy callbacks. r=mt

This commit is contained in:
Jan-Ivar Bruaroey 2014-12-08 09:37:14 -06:00
Родитель 118455dc22
Коммит 2bce7166b3
2 изменённых файлов: 94 добавлений и 68 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

121
dom/media/PeerConnection.js
Просмотреть файл

@ -499,13 +499,13 @@ RTCPeerConnection.prototype = {
},
// Log error message to web console and window.onerror, if present.
logErrorAndCallOnError: function(msg, file, line) {
this.logMsg(msg, file, line, Ci.nsIScriptError.exceptionFlag);
logErrorAndCallOnError: function(e) {
this.logMsg(e.message, e.fileName, e.lineNumber, Ci.nsIScriptError.exceptionFlag);
// Safely call onerror directly if present (necessary for testing)
try {
if (typeof this._win.onerror === "function") {
this._win.onerror(msg, file, line);
this._win.onerror(e.message, e.fileName, e.lineNumber);
}
} catch(e) {
// If onerror itself throws, service it.
@ -549,6 +549,21 @@ RTCPeerConnection.prototype = {
});
},
// Helper for legacy callbacks
thenCB: function(p, onSuccess, onError) {
var errorFunc = this.logErrorAndCallOnError.bind(this);
function callCB(func, arg) {
try {
func(arg);
} catch (e) {
errorFunc(e);
}
}
return onSuccess? p.then(result => callCB(onSuccess, result),
reason => (onError? callCB(onError, reason) : null)) : p;
},
createOffer: function(optionsOrOnSuccess, onError, options) {
// TODO: Remove old constraint-like RTCOptions support soon (Bug 1064223).
@ -600,15 +615,12 @@ RTCPeerConnection.prototype = {
JSON.stringify(options) + " instead (note the case difference)!",
null, 0);
}
let p = new this._win.Promise((resolve, reject) => {
this._queueOrRun({
func: this._createOffer,
args: [resolve, reject, options],
wait: true
});
});
return (onSuccess || onError)?
p.then(offer => { onSuccess(offer); }, onError) : p;
let p = new this._win.Promise((resolve, reject) => this._queueOrRun({
func: this._createOffer,
args: [resolve, reject, options],
wait: true
}));
return this.thenCB(p, onSuccess, onError);
},
_createOffer: function(onSuccess, onError, options) {
@ -638,15 +650,12 @@ RTCPeerConnection.prototype = {
},
createAnswer: function(onSuccess, onError) {
let p = new this._win.Promise((resolve, reject) => {
this._queueOrRun({
func: this._createAnswer,
args: [resolve, reject],
wait: true
});
});
return (onSuccess || onError)?
p.then(answer => { onSuccess(answer); }, onError) : p;
let p = new this._win.Promise((resolve, reject) => this._queueOrRun({
func: this._createAnswer,
args: [resolve, reject],
wait: true
}));
return this.thenCB(p, onSuccess, onError);
},
setLocalDescription: function(desc, onSuccess, onError) {
@ -667,14 +676,12 @@ RTCPeerConnection.prototype = {
"Invalid type " + desc.type + " provided to setLocalDescription");
}
let p = new this._win.Promise((resolve, reject) => {
this._queueOrRun({
func: this._setLocalDescription,
args: [type, desc.sdp, resolve, reject],
wait: true
});
});
return (onSuccess || onError)? p.then(() => { onSuccess(); }, onError) : p;
let p = new this._win.Promise((resolve, reject) => this._queueOrRun({
func: this._setLocalDescription,
args: [type, desc.sdp, resolve, reject],
wait: true
}));
return this.thenCB(p, onSuccess, onError);
},
_setLocalDescription: function(type, sdp, onSuccess, onError) {
@ -704,14 +711,12 @@ RTCPeerConnection.prototype = {
// Have to get caller's origin outside of Promise constructor and pass it in
let origin = Cu.getWebIDLCallerPrincipal().origin;
let p = new this._win.Promise((resolve, reject) => {
this._queueOrRun({
func: this._setRemoteDescription,
args: [type, desc.sdp, origin, resolve, reject],
wait: true
});
});
return (onSuccess || onError)? p.then(() => { onSuccess(); }, onError) : p;
let p = new this._win.Promise((resolve, reject) => this._queueOrRun({
func: this._setRemoteDescription,
args: [type, desc.sdp, origin, resolve, reject],
wait: true
}));
return this.thenCB(p, onSuccess, onError);
},
/**
@ -831,14 +836,12 @@ RTCPeerConnection.prototype = {
"Invalid candidate passed to addIceCandidate!");
}
let p = new this._win.Promise((resolve, reject) => {
this._queueOrRun({
func: this._addIceCandidate,
args: [cand, resolve, reject],
wait: false
});
});
return (onSuccess || onError)? p.then(() => { onSuccess(); }, onError) : p;
let p = new this._win.Promise((resolve, reject) => this._queueOrRun({
func: this._addIceCandidate,
args: [cand, resolve, reject],
wait: false
}));
return this.thenCB(p, onSuccess, onError);
},
_addIceCandidate: function(cand, onSuccess, onError) {
@ -1015,15 +1018,12 @@ RTCPeerConnection.prototype = {
},
getStats: function(selector, onSuccess, onError) {
let p = new this._win.Promise((resolve, reject) => {
this._queueOrRun({
func: this._getStats,
args: [selector, resolve, reject],
wait: false
});
});
return (onSuccess || onError)?
p.then(stats => { onSuccess(stats); }, onError) : p;
let p = new this._win.Promise((resolve, reject) => this._queueOrRun({
func: this._getStats,
args: [selector, resolve, reject],
wait: false
}));
return this.thenCB(p, onSuccess, onError);
},
_getStats: function(selector, onSuccess, onError) {
@ -1423,14 +1423,11 @@ RTCRtpSender.prototype = {
replaceTrack: function(withTrack) {
this._pc._checkClosed();
let p = new this._pc._win.Promise((resolve, reject) => {
this._pc._queueOrRun({
func: this._pc._replaceTrack,
args: [this, withTrack, resolve, reject],
wait: false
});
});
return p;
return new this._pc._win.Promise((resolve, reject) => this._pc._queueOrRun({
func: this._pc._replaceTrack,
args: [this, withTrack, resolve, reject],
wait: false
}));
}
};

41
dom/media/tests/mochitest/test_peerConnection_close.html
Просмотреть файл

@ -25,9 +25,7 @@
is(pc.iceGatheringState, "new", "Initial iceGatheringState is 'new'");
var finish;
var finished = new Promise(function(resolve) {
finish = resolve;
});
var finished = new Promise(resolve => finish = resolve);
pc.onsignalingstatechange = function(e) {
clearTimeout(eTimeout);
@ -59,6 +57,39 @@
// - addIceCandidate
// - getStats
//
// These legacy methods fire the error callback instead. This is not
// entirely to spec but is better than ignoring programming errors.
var offer = new mozRTCSessionDescription({ sdp: "sdp", type: "offer" });
var answer = new mozRTCSessionDescription({ sdp: "sdp", type: "answer" });
var candidate = new mozRTCIceCandidate({ candidate: "dummy",
sdpMid: "test",
sdpMLineIndex: 3 });
var doesFail = (p, msg) => p.then(generateErrorCallback(),
r => is(r.name, "InvalidStateError", msg));
doesFail(pc.createOffer(), "createOffer fails on close")
.then(() => doesFail(pc.createAnswer(), "createAnswer fails on close"))
.then(() => doesFail(pc.setLocalDescription(offer),
"setLocalDescription fails on close"))
.then(() => doesFail(pc.setRemoteDescription(answer),
"setRemoteDescription fails on close"))
.then(() => doesFail(pc.addIceCandidate(candidate),
"addIceCandidate fails on close"))
.then(() => doesFail(new Promise((y, n) => pc.createOffer(y, n)),
"Legacy createOffer fails on close"))
.then(() => doesFail(new Promise((y, n) => pc.createAnswer(y, n)),
"Legacy createAnswer fails on close"))
.then(() => doesFail(new Promise((y, n) => pc.setLocalDescription(offer, y, n)),
"Legacy setLocalDescription fails on close"))
.then(() => doesFail(new Promise((y, n) => pc.setRemoteDescription(answer, y, n)),
"Legacy setRemoteDescription fails on close"))
.then(() => doesFail(new Promise((y, n) => pc.addIceCandidate(candidate, y, n)),
"Legacy addIceCandidate fails on close"))
.catch(reason => ok(false, "unexpected failure: " + reason))
.then(finish);
// Other methods are unaffected.
SimpleTest.doesThrow(function() {
@ -80,9 +111,7 @@
SimpleTest.doesThrow(function() {
pc.setIdentityProvider("Invalid Provider")},
"setIdentityProvider() on closed PC raised expected exception");
finish();
}
};
// This prevents a mochitest timeout in case the event does not fire
eTimeout = setTimeout(function() {