diff options
author | Josh Matthews <josh@joshmatthews.net> | 2024-08-22 07:42:36 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-22 11:42:36 +0000 |
commit | 60ef6bc46125d34e492a4294622e2791f3c619b5 (patch) | |
tree | 8bc8a90f3a4647a7d6565065a8d73bd1b8f29d3d /components/script/dom/bindings/reflector.rs | |
parent | 9a1051c9170abc8e40c43b2a6be712a3ff4b523f (diff) | |
download | servo-60ef6bc46125d34e492a4294622e2791f3c619b5.tar.gz servo-60ef6bc46125d34e492a4294622e2791f3c619b5.zip |
Start marking functions that can transitively trigger a GC (#33144)
* Mark JS reflector wrappers as CanGc.
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
* Propagate CanGc from reflect_dom_object_with_proto.
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
* Mark DOM constructors as GC operations.
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
---------
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
Diffstat (limited to 'components/script/dom/bindings/reflector.rs')
-rw-r--r-- | components/script/dom/bindings/reflector.rs | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/components/script/dom/bindings/reflector.rs b/components/script/dom/bindings/reflector.rs index bc002df21ba..261a317e360 100644 --- a/components/script/dom/bindings/reflector.rs +++ b/components/script/dom/bindings/reflector.rs @@ -15,7 +15,7 @@ use crate::dom::bindings::root::{Dom, DomRoot, Root}; use crate::dom::bindings::trace::JSTraceable; use crate::dom::globalscope::GlobalScope; use crate::realms::AlreadyInRealm; -use crate::script_runtime::JSContext; +use crate::script_runtime::{CanGc, JSContext}; /// Create the reflector for a new DOM object and yield ownership to the /// reflector. @@ -25,20 +25,29 @@ where U: DerivedFrom<GlobalScope>, { let global_scope = global.upcast(); - unsafe { T::WRAP(GlobalScope::get_cx(), global_scope, None, obj) } + unsafe { + T::WRAP( + GlobalScope::get_cx(), + global_scope, + None, + obj, + CanGc::note(), + ) + } } pub fn reflect_dom_object_with_proto<T, U>( obj: Box<T>, global: &U, proto: Option<HandleObject>, + can_gc: CanGc, ) -> DomRoot<T> where T: DomObject + DomObjectWrap, U: DerivedFrom<GlobalScope>, { let global_scope = global.upcast(); - unsafe { T::WRAP(GlobalScope::get_cx(), global_scope, proto, obj) } + unsafe { T::WRAP(GlobalScope::get_cx(), global_scope, proto, obj, can_gc) } } /// A struct to store a reference to the reflector of a DOM object. @@ -131,6 +140,7 @@ pub trait DomObjectWrap: Sized + DomObject { &GlobalScope, Option<HandleObject>, Box<Self>, + CanGc, ) -> Root<Dom<Self>>; } @@ -143,5 +153,6 @@ pub trait DomObjectIteratorWrap: DomObjectWrap + JSTraceable + Iterable { &GlobalScope, Option<HandleObject>, Box<IterableIterator<Self>>, + CanGc, ) -> Root<Dom<IterableIterator<Self>>>; } |