script: Expose a constructor on HTMLCollection that takes a static function (#34667)

Expose a new constructor on `HTMLCollection`, `new_with_filter_fn`, that
filters elements using a simple static function -- a common pattern.
This allows more easily creating this `HTMLCollection` without having to
create a new data structure. Since the constructor takes a static
function, no data should be captured preventing garbage collection
issues.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Martin Robinson 2024-12-18 09:03:50 +01:00 committed by GitHub
parent d54b68bc96
commit 9d986a8ab3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 90 additions and 135 deletions

View file

@ -300,20 +300,16 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
// https://html.spec.whatwg.org/multipage/#dom-table-tbodies
fn TBodies(&self) -> DomRoot<HTMLCollection> {
#[derive(JSTraceable)]
struct TBodiesFilter;
impl CollectionFilter for TBodiesFilter {
fn filter(&self, elem: &Element, root: &Node) -> bool {
elem.is::<HTMLTableSectionElement>() &&
elem.local_name() == &local_name!("tbody") &&
elem.upcast::<Node>().GetParentNode().as_deref() == Some(root)
}
}
self.tbodies.or_init(|| {
let window = window_from_node(self);
let filter = Box::new(TBodiesFilter);
HTMLCollection::create(&window, self.upcast(), filter)
HTMLCollection::new_with_filter_fn(
&window_from_node(self),
self.upcast(),
|element, root| {
element.is::<HTMLTableSectionElement>() &&
element.local_name() == &local_name!("tbody") &&
element.upcast::<Node>().GetParentNode().as_deref() == Some(root)
},
)
})
}