author | Paul Adenot <paul@paul.cx> |
Wed, 21 Nov 2012 08:59:02 +0100 | |
changeset 113871 | 0dc53785ef12e59f2a5fdcb4f2087edfacf9e60e |
parent 113870 | 2a35b6fb48d7bfc3310f2457e6f56340ec61c194 |
child 113872 | cae58f81e28380f7fb1900e101ecad979f51350a |
push id | 23893 |
push user | ryanvm@gmail.com |
push date | Thu, 22 Nov 2012 00:50:15 +0000 |
treeherder | mozilla-central@20ec9014f220 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jesup |
bugs | 810458 |
milestone | 20.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/media/PeerConnection.js +++ b/dom/media/PeerConnection.js @@ -139,23 +139,27 @@ SessionDescription.prototype = { Ci.nsIDOMRTCSessionDescription ], flags: Ci.nsIClassInfo.DOM_OBJECT}), QueryInterface: XPCOMUtils.generateQI([ Ci.nsIDOMRTCSessionDescription, Ci.nsIDOMGlobalObjectConstructor ]), - constructor: function(win, type, sdp) { + constructor: function(win, descriptionInitDict) { if (this._win) { throw new Error("Constructor already called"); } this._win = win; - this.type = type; - this.sdp = sdp; + if (descriptionInitDict !== undefined) { + this.type = descriptionInitDict.type || null; + this.sdp = descriptionInitDict.sdp || null; + } else { + this.type = this.sdp = null; + } }, toString: function() { return JSON.stringify({ type: this.type, sdp: this.sdp }); } };