diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2024-10-28 15:03:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-28 19:03:24 +0000 |
| commit | 1070f7ac12b0d46c71071a604649c0bfca375f5e (patch) | |
| tree | f13ec20331ea81e4f56776c778fd83493f646dd1 /components/script/dom/bindings/constructor.rs | |
| parent | 884732dfb25ab8969234c1ec1ef2009b93517974 (diff) | |
| download | servo-1070f7ac12b0d46c71071a604649c0bfca375f5e.tar.gz servo-1070f7ac12b0d46c71071a604649c0bfca375f5e.zip | |
Fix invalid rooting for PropertyDescriptor (#34018)
* Clean up unnecessary uses of RootedGuard.
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
* Update mozjs.
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
---------
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
Diffstat (limited to 'components/script/dom/bindings/constructor.rs')
| -rw-r--r-- | components/script/dom/bindings/constructor.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/components/script/dom/bindings/constructor.rs b/components/script/dom/bindings/constructor.rs index 50e0d5bfffb..f5ba6b8c2c7 100644 --- a/components/script/dom/bindings/constructor.rs +++ b/components/script/dom/bindings/constructor.rs @@ -7,7 +7,6 @@ use std::ptr; use html5ever::interface::QualName; use html5ever::{local_name, namespace_url, ns, LocalName}; use js::conversions::ToJSValConvertible; -use js::gc::RootedGuard; use js::glue::{UnwrapObjectDynamic, UnwrapObjectStatic}; use js::jsapi::{CallArgs, CurrentGlobalOrNull, JSAutoRealm, JSObject}; use js::rust::wrappers::{JS_SetPrototype, JS_WrapObject}; @@ -406,11 +405,11 @@ pub unsafe fn call_html_constructor<T: DerivedFrom<Element> + DomObject>( pub unsafe fn call_default_constructor( cx: JSContext, args: &CallArgs, - global: DomRoot<GlobalScope>, + global: &GlobalScope, proto_id: PrototypeList::ID, ctor_name: &str, creator: unsafe fn(JSContext, HandleObject, *mut ProtoOrIfaceArray), - constructor: impl FnOnce(JSContext, &CallArgs, &GlobalScope, RootedGuard<*mut JSObject>) -> bool, + constructor: impl FnOnce(JSContext, &CallArgs, &GlobalScope, HandleObject) -> bool, ) -> bool { if !args.is_constructing() { throw_constructor_without_new(*cx, ctor_name); @@ -423,5 +422,5 @@ pub unsafe fn call_default_constructor( return false; } - constructor(cx, args, &global, desired_proto) + constructor(cx, args, global, desired_proto.handle()) } |