From f8b3bac7570bb669bb2d1555cfc0bd3a7ab2175d Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Sat, 26 Jan 2019 09:22:11 -0800 Subject: Add empty RTCSessionDescription interface --- components/script/dom/rtcsessiondescription.rs | 41 ++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 components/script/dom/rtcsessiondescription.rs (limited to 'components/script/dom/rtcsessiondescription.rs') diff --git a/components/script/dom/rtcsessiondescription.rs b/components/script/dom/rtcsessiondescription.rs new file mode 100644 index 00000000000..284774db7a3 --- /dev/null +++ b/components/script/dom/rtcsessiondescription.rs @@ -0,0 +1,41 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ + +use crate::dom::bindings::codegen::Bindings::RTCSessionDescriptionBinding; +use crate::dom::bindings::codegen::Bindings::RTCSessionDescriptionBinding::RTCSessionDescriptionInit; +use crate::dom::bindings::error::Fallible; +use crate::dom::bindings::reflector::reflect_dom_object; +use crate::dom::bindings::reflector::{DomObject, Reflector}; +use crate::dom::bindings::root::DomRoot; +use crate::dom::globalscope::GlobalScope; +use crate::dom::window::Window; +use dom_struct::dom_struct; + +#[dom_struct] +pub struct RTCSessionDescription { + reflector: Reflector, +} + +impl RTCSessionDescription { + pub fn new_inherited() -> RTCSessionDescription { + RTCSessionDescription { + reflector: Reflector::new(), + } + } + + pub fn new(global: &GlobalScope) -> DomRoot { + reflect_dom_object( + Box::new(RTCSessionDescription::new_inherited()), + global, + RTCSessionDescriptionBinding::Wrap, + ) + } + + pub fn Constructor( + window: &Window, + _config: &RTCSessionDescriptionInit, + ) -> Fallible> { + Ok(RTCSessionDescription::new(&window.global())) + } +} -- cgit v1.2.3 From be48cf23f931d92f9de3ccd1a2c21f5c6ee4cef9 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Sat, 26 Jan 2019 09:41:31 -0800 Subject: Fill in RTCSessionDescription --- components/script/dom/rtcsessiondescription.rs | 40 ++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 6 deletions(-) (limited to 'components/script/dom/rtcsessiondescription.rs') diff --git a/components/script/dom/rtcsessiondescription.rs b/components/script/dom/rtcsessiondescription.rs index 284774db7a3..833074d3814 100644 --- a/components/script/dom/rtcsessiondescription.rs +++ b/components/script/dom/rtcsessiondescription.rs @@ -3,11 +3,15 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ use crate::dom::bindings::codegen::Bindings::RTCSessionDescriptionBinding; -use crate::dom::bindings::codegen::Bindings::RTCSessionDescriptionBinding::RTCSessionDescriptionInit; +use crate::dom::bindings::codegen::Bindings::RTCSessionDescriptionBinding::RTCSessionDescriptionMethods; +use crate::dom::bindings::codegen::Bindings::RTCSessionDescriptionBinding::{ + RTCSdpType, RTCSessionDescriptionInit, +}; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::reflector::reflect_dom_object; use crate::dom::bindings::reflector::{DomObject, Reflector}; use crate::dom::bindings::root::DomRoot; +use crate::dom::bindings::str::DOMString; use crate::dom::globalscope::GlobalScope; use crate::dom::window::Window; use dom_struct::dom_struct; @@ -15,18 +19,26 @@ use dom_struct::dom_struct; #[dom_struct] pub struct RTCSessionDescription { reflector: Reflector, + ty: RTCSdpType, + sdp: DOMString, } impl RTCSessionDescription { - pub fn new_inherited() -> RTCSessionDescription { + pub fn new_inherited(ty: RTCSdpType, sdp: DOMString) -> RTCSessionDescription { RTCSessionDescription { reflector: Reflector::new(), + ty, + sdp, } } - pub fn new(global: &GlobalScope) -> DomRoot { + pub fn new( + global: &GlobalScope, + ty: RTCSdpType, + sdp: DOMString, + ) -> DomRoot { reflect_dom_object( - Box::new(RTCSessionDescription::new_inherited()), + Box::new(RTCSessionDescription::new_inherited(ty, sdp)), global, RTCSessionDescriptionBinding::Wrap, ) @@ -34,8 +46,24 @@ impl RTCSessionDescription { pub fn Constructor( window: &Window, - _config: &RTCSessionDescriptionInit, + config: &RTCSessionDescriptionInit, ) -> Fallible> { - Ok(RTCSessionDescription::new(&window.global())) + Ok(RTCSessionDescription::new( + &window.global(), + config.type_, + config.sdp.clone(), + )) + } +} + +impl RTCSessionDescriptionMethods for RTCSessionDescription { + /// https://www.w3.org/TR/webrtc/#dom-rtcsessiondescription-type + fn Type(&self) -> RTCSdpType { + self.ty + } + + /// https://www.w3.org/TR/webrtc/#dom-rtcsessiondescription-sdp + fn Sdp(&self) -> DOMString { + self.sdp.clone() } } -- cgit v1.2.3 From b7e2e79e53d329e5e38c3a7e1f245a1832a47b06 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Mon, 28 Jan 2019 22:24:16 -0800 Subject: Use draft spec links --- components/script/dom/rtcsessiondescription.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'components/script/dom/rtcsessiondescription.rs') diff --git a/components/script/dom/rtcsessiondescription.rs b/components/script/dom/rtcsessiondescription.rs index 833074d3814..0ef79a321c6 100644 --- a/components/script/dom/rtcsessiondescription.rs +++ b/components/script/dom/rtcsessiondescription.rs @@ -57,12 +57,12 @@ impl RTCSessionDescription { } impl RTCSessionDescriptionMethods for RTCSessionDescription { - /// https://www.w3.org/TR/webrtc/#dom-rtcsessiondescription-type + /// https://w3c.github.io/webrtc-pc/#dom-rtcsessiondescription-type fn Type(&self) -> RTCSdpType { self.ty } - /// https://www.w3.org/TR/webrtc/#dom-rtcsessiondescription-sdp + /// https://w3c.github.io/webrtc-pc/#dom-rtcsessiondescription-sdp fn Sdp(&self) -> DOMString { self.sdp.clone() } -- cgit v1.2.3 From ab04f0429bef3c2613c6a249d5a04a8cc9ca64de Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Tue, 29 Jan 2019 11:07:51 -0800 Subject: Add RTCSessionDescription::ToJSON --- components/script/dom/rtcsessiondescription.rs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'components/script/dom/rtcsessiondescription.rs') diff --git a/components/script/dom/rtcsessiondescription.rs b/components/script/dom/rtcsessiondescription.rs index 0ef79a321c6..27ab4ca3b41 100644 --- a/components/script/dom/rtcsessiondescription.rs +++ b/components/script/dom/rtcsessiondescription.rs @@ -15,6 +15,10 @@ use crate::dom::bindings::str::DOMString; use crate::dom::globalscope::GlobalScope; use crate::dom::window::Window; use dom_struct::dom_struct; +use js::conversions::ToJSValConvertible; +use js::jsapi::{JSContext, JSObject}; +use js::jsval::UndefinedValue; +use std::ptr::NonNull; #[dom_struct] pub struct RTCSessionDescription { @@ -66,4 +70,16 @@ impl RTCSessionDescriptionMethods for RTCSessionDescription { fn Sdp(&self) -> DOMString { self.sdp.clone() } + + #[allow(unsafe_code)] + /// https://w3c.github.io/webrtc-pc/#dom-rtcsessiondescription-tojson + unsafe fn ToJSON(&self, cx: *mut JSContext) -> NonNull { + let init = RTCSessionDescriptionInit { + type_: self.ty, + sdp: self.sdp.clone(), + }; + rooted!(in(cx) let mut jsval = UndefinedValue()); + init.to_jsval(cx, jsval.handle_mut()); + NonNull::new(jsval.to_object()).unwrap() + } } -- cgit v1.2.3 From 2c5d0a6ebc39ad263e2bbe623e357a11b4cec5aa Mon Sep 17 00:00:00 2001 From: marmeladema Date: Mon, 22 Jul 2019 01:09:24 +0100 Subject: Convert CGTraitInterface to use safe JSContext instead of raw JSContext --- components/script/dom/rtcsessiondescription.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'components/script/dom/rtcsessiondescription.rs') diff --git a/components/script/dom/rtcsessiondescription.rs b/components/script/dom/rtcsessiondescription.rs index 27ab4ca3b41..9aa46f56060 100644 --- a/components/script/dom/rtcsessiondescription.rs +++ b/components/script/dom/rtcsessiondescription.rs @@ -14,9 +14,10 @@ use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::globalscope::GlobalScope; use crate::dom::window::Window; +use crate::script_runtime::JSContext; use dom_struct::dom_struct; use js::conversions::ToJSValConvertible; -use js::jsapi::{JSContext, JSObject}; +use js::jsapi::JSObject; use js::jsval::UndefinedValue; use std::ptr::NonNull; @@ -73,13 +74,15 @@ impl RTCSessionDescriptionMethods for RTCSessionDescription { #[allow(unsafe_code)] /// https://w3c.github.io/webrtc-pc/#dom-rtcsessiondescription-tojson - unsafe fn ToJSON(&self, cx: *mut JSContext) -> NonNull { + fn ToJSON(&self, cx: JSContext) -> NonNull { let init = RTCSessionDescriptionInit { type_: self.ty, sdp: self.sdp.clone(), }; - rooted!(in(cx) let mut jsval = UndefinedValue()); - init.to_jsval(cx, jsval.handle_mut()); - NonNull::new(jsval.to_object()).unwrap() + unsafe { + rooted!(in(*cx) let mut jsval = UndefinedValue()); + init.to_jsval(*cx, jsval.handle_mut()); + NonNull::new(jsval.to_object()).unwrap() + } } } -- cgit v1.2.3 From 16b4e3446bc466c87327fac3402736d3636a5f73 Mon Sep 17 00:00:00 2001 From: Kagami Sascha Rosylight Date: Wed, 24 Jul 2019 17:11:44 +0900 Subject: Support default toJSON in WebIDL --- components/script/dom/rtcsessiondescription.rs | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'components/script/dom/rtcsessiondescription.rs') diff --git a/components/script/dom/rtcsessiondescription.rs b/components/script/dom/rtcsessiondescription.rs index 27ab4ca3b41..0ef79a321c6 100644 --- a/components/script/dom/rtcsessiondescription.rs +++ b/components/script/dom/rtcsessiondescription.rs @@ -15,10 +15,6 @@ use crate::dom::bindings::str::DOMString; use crate::dom::globalscope::GlobalScope; use crate::dom::window::Window; use dom_struct::dom_struct; -use js::conversions::ToJSValConvertible; -use js::jsapi::{JSContext, JSObject}; -use js::jsval::UndefinedValue; -use std::ptr::NonNull; #[dom_struct] pub struct RTCSessionDescription { @@ -70,16 +66,4 @@ impl RTCSessionDescriptionMethods for RTCSessionDescription { fn Sdp(&self) -> DOMString { self.sdp.clone() } - - #[allow(unsafe_code)] - /// https://w3c.github.io/webrtc-pc/#dom-rtcsessiondescription-tojson - unsafe fn ToJSON(&self, cx: *mut JSContext) -> NonNull { - let init = RTCSessionDescriptionInit { - type_: self.ty, - sdp: self.sdp.clone(), - }; - rooted!(in(cx) let mut jsval = UndefinedValue()); - init.to_jsval(cx, jsval.handle_mut()); - NonNull::new(jsval.to_object()).unwrap() - } } -- cgit v1.2.3 From 87cc409579a1ccdc81da8ceecf41125a302a39bc Mon Sep 17 00:00:00 2001 From: Kagami Sascha Rosylight Date: Thu, 25 Jul 2019 11:14:21 +0900 Subject: use SafeJSContext --- components/script/dom/rtcsessiondescription.rs | 1 - 1 file changed, 1 deletion(-) (limited to 'components/script/dom/rtcsessiondescription.rs') diff --git a/components/script/dom/rtcsessiondescription.rs b/components/script/dom/rtcsessiondescription.rs index 6a2a70ebdbd..0ef79a321c6 100644 --- a/components/script/dom/rtcsessiondescription.rs +++ b/components/script/dom/rtcsessiondescription.rs @@ -14,7 +14,6 @@ use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::globalscope::GlobalScope; use crate::dom::window::Window; -use crate::script_runtime::JSContext; use dom_struct::dom_struct; #[dom_struct] -- cgit v1.2.3 From f7db4b7f8011239f01c3ba2e5e402c866fbe68fb Mon Sep 17 00:00:00 2001 From: Kunal Mohan Date: Sat, 18 Jan 2020 01:29:26 +0530 Subject: Modify `script` to prevent further violations of snake_case --- components/script/dom/rtcsessiondescription.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'components/script/dom/rtcsessiondescription.rs') diff --git a/components/script/dom/rtcsessiondescription.rs b/components/script/dom/rtcsessiondescription.rs index 0ef79a321c6..68be62e577b 100644 --- a/components/script/dom/rtcsessiondescription.rs +++ b/components/script/dom/rtcsessiondescription.rs @@ -44,6 +44,7 @@ impl RTCSessionDescription { ) } + #[allow(non_snake_case)] pub fn Constructor( window: &Window, config: &RTCSessionDescriptionInit, -- cgit v1.2.3 From 3ea6d87bcc37167464e856949a4b9b77d0e9318a Mon Sep 17 00:00:00 2001 From: YUAN LYU Date: Fri, 20 Mar 2020 22:14:18 -0400 Subject: Add trait DomObjectWrap to provide WRAP function --- components/script/dom/rtcsessiondescription.rs | 2 -- 1 file changed, 2 deletions(-) (limited to 'components/script/dom/rtcsessiondescription.rs') diff --git a/components/script/dom/rtcsessiondescription.rs b/components/script/dom/rtcsessiondescription.rs index 68be62e577b..2ff7157e5d4 100644 --- a/components/script/dom/rtcsessiondescription.rs +++ b/components/script/dom/rtcsessiondescription.rs @@ -2,7 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -use crate::dom::bindings::codegen::Bindings::RTCSessionDescriptionBinding; use crate::dom::bindings::codegen::Bindings::RTCSessionDescriptionBinding::RTCSessionDescriptionMethods; use crate::dom::bindings::codegen::Bindings::RTCSessionDescriptionBinding::{ RTCSdpType, RTCSessionDescriptionInit, @@ -40,7 +39,6 @@ impl RTCSessionDescription { reflect_dom_object( Box::new(RTCSessionDescription::new_inherited(ty, sdp)), global, - RTCSessionDescriptionBinding::Wrap, ) } -- cgit v1.2.3