mirror of
https://github.com/servo/servo.git
synced 2025-07-24 15:50:21 +01:00
Add RTCPeerConnection::SetRemoteDescription
This commit is contained in:
parent
95cd67cb65
commit
93a359e528
2 changed files with 43 additions and 2 deletions
|
@ -55,6 +55,7 @@ pub struct RTCPeerConnection {
|
||||||
#[ignore_malloc_size_of = "promises are hard"]
|
#[ignore_malloc_size_of = "promises are hard"]
|
||||||
answer_promises: DomRefCell<Vec<Rc<Promise>>>,
|
answer_promises: DomRefCell<Vec<Rc<Promise>>>,
|
||||||
local_description: MutNullableDom<RTCSessionDescription>,
|
local_description: MutNullableDom<RTCSessionDescription>,
|
||||||
|
remote_description: MutNullableDom<RTCSessionDescription>,
|
||||||
}
|
}
|
||||||
|
|
||||||
struct RTCSignaller {
|
struct RTCSignaller {
|
||||||
|
@ -103,6 +104,7 @@ impl RTCPeerConnection {
|
||||||
offer_promises: DomRefCell::new(vec![]),
|
offer_promises: DomRefCell::new(vec![]),
|
||||||
answer_promises: DomRefCell::new(vec![]),
|
answer_promises: DomRefCell::new(vec![]),
|
||||||
local_description: Default::default(),
|
local_description: Default::default(),
|
||||||
|
remote_description: Default::default(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -318,8 +320,14 @@ impl RTCPeerConnectionMethods for RTCPeerConnection {
|
||||||
self.local_description.get()
|
self.local_description.get()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-remotedescription
|
||||||
|
fn GetRemoteDescription(&self) -> Option<DomRoot<RTCSessionDescription>> {
|
||||||
|
self.remote_description.get()
|
||||||
|
}
|
||||||
|
|
||||||
/// https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-setlocaldescription
|
/// https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-setlocaldescription
|
||||||
fn SetLocalDescription(&self, desc: &RTCSessionDescriptionInit) -> Rc<Promise> {
|
fn SetLocalDescription(&self, desc: &RTCSessionDescriptionInit) -> Rc<Promise> {
|
||||||
|
// XXXManishearth validate the current state
|
||||||
let p = Promise::new(&self.global());
|
let p = Promise::new(&self.global());
|
||||||
let this = Trusted::new(self);
|
let this = Trusted::new(self);
|
||||||
let desc: SessionDescription = desc.into();
|
let desc: SessionDescription = desc.into();
|
||||||
|
@ -349,6 +357,39 @@ impl RTCPeerConnectionMethods for RTCPeerConnection {
|
||||||
}).into());
|
}).into());
|
||||||
p
|
p
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-setremotedescription
|
||||||
|
fn SetRemoteDescription(&self, desc: &RTCSessionDescriptionInit) -> Rc<Promise> {
|
||||||
|
// XXXManishearth validate the current state
|
||||||
|
let p = Promise::new(&self.global());
|
||||||
|
let this = Trusted::new(self);
|
||||||
|
let desc: SessionDescription = desc.into();
|
||||||
|
let trusted_promise = TrustedPromise::new(p.clone());
|
||||||
|
let (task_source, canceller) = self
|
||||||
|
.global()
|
||||||
|
.as_window()
|
||||||
|
.task_manager()
|
||||||
|
.networking_task_source_with_canceller();
|
||||||
|
self.controller
|
||||||
|
.borrow_mut()
|
||||||
|
.as_ref()
|
||||||
|
.unwrap()
|
||||||
|
.set_remote_description(desc.clone(), (move || {
|
||||||
|
let _ = task_source.queue_with_canceller(
|
||||||
|
task!(remote_description_set: move || {
|
||||||
|
// XXXManishearth spec actually asks for an intricate
|
||||||
|
// dance between pending/current local/remote descriptions
|
||||||
|
let this = this.root();
|
||||||
|
let desc = desc.into();
|
||||||
|
let desc = RTCSessionDescription::Constructor(&this.global().as_window(), &desc).unwrap();
|
||||||
|
this.remote_description.set(Some(&desc));
|
||||||
|
trusted_promise.root().resolve_native(&())
|
||||||
|
}),
|
||||||
|
&canceller,
|
||||||
|
);
|
||||||
|
}).into());
|
||||||
|
p
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<SessionDescription> for RTCSessionDescriptionInit {
|
impl From<SessionDescription> for RTCSessionDescriptionInit {
|
||||||
|
|
|
@ -13,8 +13,8 @@ interface RTCPeerConnection : EventTarget {
|
||||||
readonly attribute RTCSessionDescription? localDescription;
|
readonly attribute RTCSessionDescription? localDescription;
|
||||||
// readonly attribute RTCSessionDescription? currentLocalDescription;
|
// readonly attribute RTCSessionDescription? currentLocalDescription;
|
||||||
// readonly attribute RTCSessionDescription? pendingLocalDescription;
|
// readonly attribute RTCSessionDescription? pendingLocalDescription;
|
||||||
// Promise<void> setRemoteDescription(RTCSessionDescriptionInit description);
|
Promise<void> setRemoteDescription(RTCSessionDescriptionInit description);
|
||||||
// readonly attribute RTCSessionDescription? remoteDescription;
|
readonly attribute RTCSessionDescription? remoteDescription;
|
||||||
// readonly attribute RTCSessionDescription? currentRemoteDescription;
|
// readonly attribute RTCSessionDescription? currentRemoteDescription;
|
||||||
// readonly attribute RTCSessionDescription? pendingRemoteDescription;
|
// readonly attribute RTCSessionDescription? pendingRemoteDescription;
|
||||||
Promise<void> addIceCandidate(optional RTCIceCandidateInit candidate);
|
Promise<void> addIceCandidate(optional RTCIceCandidateInit candidate);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue