diff options
author | Josh Matthews <josh@joshmatthews.net> | 2024-11-05 03:29:08 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-11-05 08:29:08 +0000 |
commit | 25a0764a37a585d032ca352923b24995f8cbf1a0 (patch) | |
tree | 1805edc4fc79396de9150f8bc063888926d53d3b /components/script/dom/customelementregistry.rs | |
parent | 537958a3ccb57502c558e4da0963307fd7481a14 (diff) | |
download | servo-25a0764a37a585d032ca352923b24995f8cbf1a0.tar.gz servo-25a0764a37a585d032ca352923b24995f8cbf1a0.zip |
Use out parameter for generated methods returning JSVal (#34087)
* Make generated bindings that return a WebIDL `any` value use out parameters.
Returning raw JSVal values makes it easier to create GC hazards in code
that calls these methods. Accepting a MutableHandle argument instead
ensures that the values are rooted by the caller.
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
* Update mozjs.
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
* Fix clippy warnings.
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
---------
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
Diffstat (limited to 'components/script/dom/customelementregistry.rs')
-rw-r--r-- | components/script/dom/customelementregistry.rs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/components/script/dom/customelementregistry.rs b/components/script/dom/customelementregistry.rs index dfbbe5e5d79..dd8675b066d 100644 --- a/components/script/dom/customelementregistry.rs +++ b/components/script/dom/customelementregistry.rs @@ -548,16 +548,12 @@ impl CustomElementRegistryMethods for CustomElementRegistry { /// <https://html.spec.whatwg.org/multipage/#dom-customelementregistry-get> #[allow(unsafe_code)] - fn Get(&self, cx: JSContext, name: DOMString) -> JSVal { + fn Get(&self, cx: JSContext, name: DOMString, mut retval: MutableHandleValue) { match self.definitions.borrow().get(&LocalName::from(&*name)) { Some(definition) => unsafe { - rooted!(in(*cx) let mut constructor = UndefinedValue()); - definition - .constructor - .to_jsval(*cx, constructor.handle_mut()); - constructor.get() + definition.constructor.to_jsval(*cx, retval); }, - None => UndefinedValue(), + None => retval.set(UndefinedValue()), } } @@ -994,7 +990,13 @@ impl CustomElementReaction { .iter() .map(|arg| unsafe { HandleValue::from_raw(arg.handle()) }) .collect(); - let _ = callback.Call_(element, arguments, ExceptionHandling::Report); + rooted!(in(*GlobalScope::get_cx()) let mut value: JSVal); + let _ = callback.Call_( + element, + arguments, + value.handle_mut(), + ExceptionHandling::Report, + ); }, } } |