Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add CanGc as arguments in methods in Attr and Node (#36371)

Browse source 
Add CanGc as argument to methods in `Attr` and `Node`.

Addressed part of https://github.com/servo/servo/issues/34573.

---

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because they are a refactor.

Signed-off-by: Yerkebulan Tulibergenov <yerkebulan@gmail.com>
This commit is contained in:
Yerkebulan Tulibergenov 2025-04-05 23:27:59 -07:00 • committed by GitHub
parent bd43b78735
commit 6898eae61e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 137 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/devtools.rs
View file

@ -105,7 +105,7 @@ pub(crate) fn handle_get_root_node(
) { ) {
let info = documents let info = documents
.find_document(pipeline) .find_document(pipeline)
.map(|document| document.upcast::<Node>().summarize()); .map(|document| document.upcast::<Node>().summarize(CanGc::note()));
reply.send(info).unwrap(); reply.send(info).unwrap();
} }
@ -117,7 +117,7 @@ pub(crate) fn handle_get_document_element(
let info = documents let info = documents
.find_document(pipeline) .find_document(pipeline)
.and_then(|document| document.GetDocumentElement()) .and_then(|document| document.GetDocumentElement())
.map(|element| element.upcast::<Node>().summarize()); .map(|element| element.upcast::<Node>().summarize(CanGc::note()));
reply.send(info).unwrap(); reply.send(info).unwrap();
} }
@ -166,7 +166,7 @@ pub(crate) fn handle_get_children(
if !shadow_root.is_user_agent_widget() || if !shadow_root.is_user_agent_widget() ||
pref!(inspector_show_servo_internal_shadow_roots) pref!(inspector_show_servo_internal_shadow_roots)
{ {
children.push(shadow_root.upcast::<Node>().summarize()); children.push(shadow_root.upcast::<Node>().summarize(CanGc::note()));
} }
} }
let children_iter = parent.children().enumerate().filter_map(|(i, child)| { let children_iter = parent.children().enumerate().filter_map(|(i, child)| {
@ -175,7 +175,7 @@ pub(crate) fn handle_get_children(
let prev_inline = i > 0 && inline[i - 1]; let prev_inline = i > 0 && inline[i - 1];
let next_inline = i < inline.len() - 1 && inline[i + 1]; let next_inline = i < inline.len() - 1 && inline[i + 1];
let info = child.summarize(); let info = child.summarize(CanGc::note());
if !is_whitespace(&info) { if !is_whitespace(&info) {
return Some(info); return Some(info);
} }

4
components/script/dom/attr.rs
View file

@ -112,10 +112,10 @@ impl AttrMethods<crate::DomTypeHolder> for Attr {
} }
// https://dom.spec.whatwg.org/#dom-attr-value // https://dom.spec.whatwg.org/#dom-attr-value
fn SetValue(&self, value: DOMString) { fn SetValue(&self, value: DOMString, can_gc: CanGc) {
if let Some(owner) = self.owner() { if let Some(owner) = self.owner() {
let value = owner.parse_attribute(self.namespace(), self.local_name(), value); let value = owner.parse_attribute(self.namespace(), self.local_name(), value);
self.set_value(value, &owner, CanGc::note()); self.set_value(value, &owner, can_gc);
} else { } else {
*self.value.borrow_mut() = AttrValue::String(value.into()); *self.value.borrow_mut() = AttrValue::String(value.into());
} }

14
components/script/dom/document.rs
View file

@ -2249,13 +2249,13 @@ impl Document {
for node in nodes { for node in nodes {
match node { match node {
NodeOrString::Node(node) => { NodeOrString::Node(node) => {
fragment.AppendChild(&node)?; fragment.AppendChild(&node, can_gc)?;
}, },
NodeOrString::String(string) => { NodeOrString::String(string) => {
let node = DomRoot::upcast::<Node>(self.CreateTextNode(string, can_gc)); let node = DomRoot::upcast::<Node>(self.CreateTextNode(string, can_gc));
// No try!() here because appending a text node // No try!() here because appending a text node
// should not fail. // should not fail.
fragment.AppendChild(&node).unwrap(); fragment.AppendChild(&node, can_gc).unwrap();
}, },
} }
} }
@ -5404,7 +5404,7 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
let parent = root.upcast::<Node>(); let parent = root.upcast::<Node>();
let child = elem.upcast::<Node>(); let child = elem.upcast::<Node>();
parent parent
.InsertBefore(child, parent.GetFirstChild().as_deref()) .InsertBefore(child, parent.GetFirstChild().as_deref(), can_gc)
.unwrap() .unwrap()
}, },
} }
@ -5427,7 +5427,9 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
None, None,
can_gc, can_gc,
); );
head.upcast::<Node>().AppendChild(elem.upcast()).unwrap() head.upcast::<Node>()
.AppendChild(elem.upcast(), can_gc)
.unwrap()
}, },
None => return, None => return,
}, },
@ -5500,7 +5502,7 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
// Step 3. // Step 3.
(Some(ref root), Some(child)) => { (Some(ref root), Some(child)) => {
let root = root.upcast::<Node>(); let root = root.upcast::<Node>();
root.ReplaceChild(new_body.upcast(), child.upcast()) root.ReplaceChild(new_body.upcast(), child.upcast(), CanGc::note())
.unwrap(); .unwrap();
}, },
@ -5510,7 +5512,7 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
// Step 5. // Step 5.
(Some(ref root), &None) => { (Some(ref root), &None) => {
let root = root.upcast::<Node>(); let root = root.upcast::<Node>();
root.AppendChild(new_body.upcast()).unwrap(); root.AppendChild(new_body.upcast(), CanGc::note()).unwrap();
}, },
} }
Ok(()) Ok(())

18
components/script/dom/domimplementation.rs
View file

@ -138,12 +138,12 @@ impl DOMImplementationMethods<crate::DomTypeHolder> for DOMImplementation {
// Step 4. // Step 4.
if let Some(doc_type) = maybe_doctype { if let Some(doc_type) = maybe_doctype {
doc_node.AppendChild(doc_type.upcast()).unwrap(); doc_node.AppendChild(doc_type.upcast(), can_gc).unwrap();
} }
// Step 5. // Step 5.
if let Some(ref elem) = maybe_elem { if let Some(ref elem) = maybe_elem {
doc_node.AppendChild(elem.upcast()).unwrap(); doc_node.AppendChild(elem.upcast(), can_gc).unwrap();
} }
} }
@ -185,7 +185,7 @@ impl DOMImplementationMethods<crate::DomTypeHolder> for DOMImplementation {
// Step 3. // Step 3.
let doc_node = doc.upcast::<Node>(); let doc_node = doc.upcast::<Node>();
let doc_type = DocumentType::new(DOMString::from("html"), None, None, &doc, can_gc); let doc_type = DocumentType::new(DOMString::from("html"), None, None, &doc, can_gc);
doc_node.AppendChild(doc_type.upcast()).unwrap(); doc_node.AppendChild(doc_type.upcast(), can_gc).unwrap();
} }
{ {
@ -198,7 +198,9 @@ impl DOMImplementationMethods<crate::DomTypeHolder> for DOMImplementation {
None, None,
can_gc, can_gc,
)); ));
doc_node.AppendChild(&doc_html).expect("Appending failed"); doc_node
.AppendChild(&doc_html, can_gc)
.expect("Appending failed");
{ {
// Step 5. // Step 5.
@ -209,7 +211,7 @@ impl DOMImplementationMethods<crate::DomTypeHolder> for DOMImplementation {
None, None,
can_gc, can_gc,
)); ));
doc_html.AppendChild(&doc_head).unwrap(); doc_html.AppendChild(&doc_head, can_gc).unwrap();
// Step 6. // Step 6.
if let Some(title_str) = title { if let Some(title_str) = title {
@ -221,17 +223,17 @@ impl DOMImplementationMethods<crate::DomTypeHolder> for DOMImplementation {
None, None,
can_gc, can_gc,
)); ));
doc_head.AppendChild(&doc_title).unwrap(); doc_head.AppendChild(&doc_title, can_gc).unwrap();
// Step 6.2. // Step 6.2.
let title_text = Text::new(title_str, &doc, can_gc); let title_text = Text::new(title_str, &doc, can_gc);
doc_title.AppendChild(title_text.upcast()).unwrap(); doc_title.AppendChild(title_text.upcast(), can_gc).unwrap();
} }
} }
// Step 7. // Step 7.
let doc_body = HTMLBodyElement::new(local_name!("body"), None, &doc, None, can_gc); let doc_body = HTMLBodyElement::new(local_name!("body"), None, &doc, None, can_gc);
doc_html.AppendChild(doc_body.upcast()).unwrap(); doc_html.AppendChild(doc_body.upcast(), can_gc).unwrap();
} }
// Step 8. // Step 8.

9
components/script/dom/element.rs
View file

@ -2170,7 +2170,10 @@ impl Element {
let fragment = DocumentFragment::new(&context_document, can_gc); let fragment = DocumentFragment::new(&context_document, can_gc);
// Step 4. // Step 4.
for child in new_children { for child in new_children {
fragment.upcast::<Node>().AppendChild(&child).unwrap(); fragment
.upcast::<Node>()
.AppendChild(&child, can_gc)
.unwrap();
} }
// Step 5. // Step 5.
Ok(fragment) Ok(fragment)
@ -2973,7 +2976,7 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
// For each node in newChildren, append node to fragment. // For each node in newChildren, append node to fragment.
for child in new_children { for child in new_children {
frag.upcast::<Node>().AppendChild(&child).unwrap(); frag.upcast::<Node>().AppendChild(&child, can_gc).unwrap();
} }
// Replace all with fragment within target. // Replace all with fragment within target.
@ -3093,7 +3096,7 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
// Step 5. // Step 5.
let frag = parent.parse_fragment(value, can_gc)?; let frag = parent.parse_fragment(value, can_gc)?;
// Step 6. // Step 6.
context_parent.ReplaceChild(frag.upcast(), context_node)?; context_parent.ReplaceChild(frag.upcast(), context_node, can_gc)?;
Ok(()) Ok(())
} }

6
components/script/dom/htmldetailselement.rs
View file

@ -118,7 +118,7 @@ impl HTMLDetailsElement {
let summary = HTMLSlotElement::new(local_name!("slot"), None, &document, None, can_gc); let summary = HTMLSlotElement::new(local_name!("slot"), None, &document, None, can_gc);
root.upcast::<Node>() root.upcast::<Node>()
.AppendChild(summary.upcast::<Node>()) .AppendChild(summary.upcast::<Node>(), can_gc)
.unwrap(); .unwrap();
let fallback_summary = let fallback_summary =
@ -128,12 +128,12 @@ impl HTMLDetailsElement {
.SetTextContent(Some(DEFAULT_SUMMARY.into()), can_gc); .SetTextContent(Some(DEFAULT_SUMMARY.into()), can_gc);
summary summary
.upcast::<Node>() .upcast::<Node>()
.AppendChild(fallback_summary.upcast::<Node>()) .AppendChild(fallback_summary.upcast::<Node>(), can_gc)
.unwrap(); .unwrap();
let descendants = HTMLSlotElement::new(local_name!("slot"), None, &document, None, can_gc); let descendants = HTMLSlotElement::new(local_name!("slot"), None, &document, None, can_gc);
root.upcast::<Node>() root.upcast::<Node>()
.AppendChild(descendants.upcast::<Node>()) .AppendChild(descendants.upcast::<Node>(), can_gc)
.unwrap(); .unwrap();
let _ = self.shadow_tree.borrow_mut().insert(ShadowTree { let _ = self.shadow_tree.borrow_mut().insert(ShadowTree {

13
components/script/dom/htmlelement.rs
View file

@ -532,11 +532,13 @@ impl HTMLElementMethods<crate::DomTypeHolder> for HTMLElement {
if fragment.upcast::<Node>().children_count() == 0 { if fragment.upcast::<Node>().children_count() == 0 {
let text_node = Text::new(DOMString::from("".to_owned()), &document, can_gc); let text_node = Text::new(DOMString::from("".to_owned()), &document, can_gc);
fragment.upcast::<Node>().AppendChild(text_node.upcast())?; fragment
.upcast::<Node>()
.AppendChild(text_node.upcast(), can_gc)?;
} }
// Step 6: Replace this with fragment within this's parent. // Step 6: Replace this with fragment within this's parent.
parent.ReplaceChild(fragment.upcast(), node)?; parent.ReplaceChild(fragment.upcast(), node, can_gc)?;
// Step 7: If next is non-null and next's previous sibling is a Text node, then merge with // Step 7: If next is non-null and next's previous sibling is a Text node, then merge with
// the next text node given next's previous sibling. // the next text node given next's previous sibling.
@ -670,7 +672,7 @@ fn append_text_node_to_fragment(
let text = Text::new(DOMString::from(text), document, can_gc); let text = Text::new(DOMString::from(text), document, can_gc);
fragment fragment
.upcast::<Node>() .upcast::<Node>()
.AppendChild(text.upcast()) .AppendChild(text.upcast(), can_gc)
.unwrap(); .unwrap();
} }
@ -1016,7 +1018,10 @@ impl HTMLElement {
} }
let br = HTMLBRElement::new(local_name!("br"), None, &document, None, can_gc); let br = HTMLBRElement::new(local_name!("br"), None, &document, None, can_gc);
fragment.upcast::<Node>().AppendChild(br.upcast()).unwrap(); fragment
.upcast::<Node>()
.AppendChild(br.upcast(), can_gc)
.unwrap();
}, },
_ => { _ => {
// Collect a sequence of code points that are not U+000A LF or U+000D CR from // Collect a sequence of code points that are not U+000A LF or U+000D CR from

4
components/script/dom/htmlmediaelement.rs
View file

@ -1928,7 +1928,7 @@ impl HTMLMediaElement {
.SetTextContent(Some(DOMString::from(media_controls_script)), can_gc); .SetTextContent(Some(DOMString::from(media_controls_script)), can_gc);
if let Err(e) = shadow_root if let Err(e) = shadow_root
.upcast::<Node>() .upcast::<Node>()
.AppendChild(script.upcast::<Node>()) .AppendChild(script.upcast::<Node>(), can_gc)
{ {
warn!("Could not render media controls {:?}", e); warn!("Could not render media controls {:?}", e);
return; return;
@ -1949,7 +1949,7 @@ impl HTMLMediaElement {
if let Err(e) = shadow_root if let Err(e) = shadow_root
.upcast::<Node>() .upcast::<Node>()
.AppendChild(style.upcast::<Node>()) .AppendChild(style.upcast::<Node>(), can_gc)
{ {
warn!("Could not render media controls {:?}", e); warn!("Could not render media controls {:?}", e);
} }

2
components/script/dom/htmlmeterelement.rs
View file

@ -94,7 +94,7 @@ impl HTMLMeterElement {
let meter_value = HTMLDivElement::new(local_name!("div"), None, &document, None, can_gc); let meter_value = HTMLDivElement::new(local_name!("div"), None, &document, None, can_gc);
root.upcast::<Node>() root.upcast::<Node>()
.AppendChild(meter_value.upcast::<Node>()) .AppendChild(meter_value.upcast::<Node>(), can_gc)
.unwrap(); .unwrap();
let _ = self.shadow_tree.borrow_mut().insert(ShadowTree { let _ = self.shadow_tree.borrow_mut().insert(ShadowTree {

4
components/script/dom/htmloptionscollection.rs
View file

@ -64,7 +64,7 @@ impl HTMLOptionsCollection {
let element = let element =
HTMLOptionElement::new(local_name!("option"), None, &document, None, can_gc); HTMLOptionElement::new(local_name!("option"), None, &document, None, can_gc);
let node = element.upcast::<Node>(); let node = element.upcast::<Node>();
root.AppendChild(node)?; root.AppendChild(node, can_gc)?;
} }
Ok(()) Ok(())
} }
@ -122,7 +122,7 @@ impl HTMLOptionsCollectionMethods<crate::DomTypeHolder> for HTMLOptionsCollectio
let child = self.upcast().IndexedGetter(index).unwrap(); let child = self.upcast().IndexedGetter(index).unwrap();
let child_node = child.upcast::<Node>(); let child_node = child.upcast::<Node>();
root.ReplaceChild(node, child_node).map(|_| ()) root.ReplaceChild(node, child_node, can_gc).map(|_| ())
} }
} else { } else {
// Step 1 // Step 1

2
components/script/dom/htmlprogresselement.rs
View file

@ -96,7 +96,7 @@ impl HTMLProgressElement {
.upcast::<Element>() .upcast::<Element>()
.SetId("-servo-progress-bar".into(), can_gc); .SetId("-servo-progress-bar".into(), can_gc);
root.upcast::<Node>() root.upcast::<Node>()
.AppendChild(progress_bar.upcast::<Node>()) .AppendChild(progress_bar.upcast::<Node>(), can_gc)
.unwrap(); .unwrap();
let _ = self.shadow_tree.borrow_mut().insert(ShadowTree { let _ = self.shadow_tree.borrow_mut().insert(ShadowTree {

8
components/script/dom/htmlselectelement.rs
View file

@ -286,7 +286,7 @@ impl HTMLSelectElement {
); );
select_box select_box
.upcast::<Node>() .upcast::<Node>()
.AppendChild(text_container.upcast::<Node>()) .AppendChild(text_container.upcast::<Node>(), can_gc)
.unwrap(); .unwrap();
let text = Text::new(DOMString::new(), &document, can_gc); let text = Text::new(DOMString::new(), &document, can_gc);
@ -295,7 +295,7 @@ impl HTMLSelectElement {
}); });
text_container text_container
.upcast::<Node>() .upcast::<Node>()
.AppendChild(text.upcast::<Node>()) .AppendChild(text.upcast::<Node>(), can_gc)
.unwrap(); .unwrap();
let chevron_container = let chevron_container =
@ -310,11 +310,11 @@ impl HTMLSelectElement {
.SetTextContent(Some("▾".into()), can_gc); .SetTextContent(Some("▾".into()), can_gc);
select_box select_box
.upcast::<Node>() .upcast::<Node>()
.AppendChild(chevron_container.upcast::<Node>()) .AppendChild(chevron_container.upcast::<Node>(), can_gc)
.unwrap(); .unwrap();
root.upcast::<Node>() root.upcast::<Node>()
.AppendChild(select_box.upcast::<Node>()) .AppendChild(select_box.upcast::<Node>(), can_gc)
.unwrap(); .unwrap();
} }

24
components/script/dom/htmltableelement.rs
View file

@ -133,7 +133,7 @@ impl HTMLTableElement {
let reference_element = node.child_elements().find(reference_predicate); let reference_element = node.child_elements().find(reference_predicate);
let reference_node = reference_element.as_ref().map(|e| e.upcast()); let reference_node = reference_element.as_ref().map(|e| e.upcast());
node.InsertBefore(section.upcast(), reference_node)?; node.InsertBefore(section.upcast(), reference_node, can_gc)?;
} }
Ok(()) Ok(())
@ -212,7 +212,11 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
if let Some(caption) = new_caption { if let Some(caption) = new_caption {
let node = self.upcast::<Node>(); let node = self.upcast::<Node>();
node.InsertBefore(caption.upcast(), node.GetFirstChild().as_deref())?; node.InsertBefore(
caption.upcast(),
node.GetFirstChild().as_deref(),
CanGc::note(),
)?;
} }
Ok(()) Ok(())
@ -339,7 +343,7 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
.find(|n| n.is::<HTMLTableSectionElement>() && n.local_name() == &local_name!("tbody")); .find(|n| n.is::<HTMLTableSectionElement>() && n.local_name() == &local_name!("tbody"));
let reference_element = last_tbody.and_then(|t| t.upcast::<Node>().GetNextSibling()); let reference_element = last_tbody.and_then(|t| t.upcast::<Node>().GetNextSibling());
node.InsertBefore(tbody.upcast(), reference_element.as_deref()) node.InsertBefore(tbody.upcast(), reference_element.as_deref(), can_gc)
.expect("Insertion failed"); .expect("Insertion failed");
tbody tbody
} }
@ -373,16 +377,16 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
{ {
last_tbody last_tbody
.upcast::<Node>() .upcast::<Node>()
.AppendChild(new_row.upcast::<Node>()) .AppendChild(new_row.upcast::<Node>(), can_gc)
.expect("InsertRow failed to append first row."); .expect("InsertRow failed to append first row.");
} else { } else {
let tbody = self.CreateTBody(can_gc); let tbody = self.CreateTBody(can_gc);
node.AppendChild(tbody.upcast()) node.AppendChild(tbody.upcast(), can_gc)
.expect("InsertRow failed to append new tbody."); .expect("InsertRow failed to append new tbody.");
tbody tbody
.upcast::<Node>() .upcast::<Node>()
.AppendChild(new_row.upcast::<Node>()) .AppendChild(new_row.upcast::<Node>(), can_gc)
.expect("InsertRow failed to append first row."); .expect("InsertRow failed to append first row.");
} }
} else if index == number_of_row_elements as i32 || index == -1 { } else if index == number_of_row_elements as i32 || index == -1 {
@ -398,7 +402,7 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
last_row_parent last_row_parent
.upcast::<Node>() .upcast::<Node>()
.AppendChild(new_row.upcast::<Node>()) .AppendChild(new_row.upcast::<Node>(), can_gc)
.expect("InsertRow failed to append last row."); .expect("InsertRow failed to append last row.");
} else { } else {
// insert new row before the index-th row in rows using the same parent // insert new row before the index-th row in rows using the same parent
@ -413,7 +417,11 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
ith_row_parent ith_row_parent
.upcast::<Node>() .upcast::<Node>()
.InsertBefore(new_row.upcast::<Node>(), Some(ith_row.upcast::<Node>())) .InsertBefore(
new_row.upcast::<Node>(),
Some(ith_row.upcast::<Node>()),
can_gc,
)
.expect("InsertRow failed to append row"); .expect("InsertRow failed to append row");
} }

2
components/script/dom/htmltemplateelement.rs
View file

@ -149,7 +149,7 @@ impl VirtualMethods for HTMLTemplateElement {
CloneChildrenFlag::CloneChildren, CloneChildrenFlag::CloneChildren,
CanGc::note(), CanGc::note(),
); );
copy_contents.AppendChild(&copy_child).unwrap(); copy_contents.AppendChild(&copy_child, can_gc).unwrap();
} }
} }
} }

66
components/script/dom/node.rs
View file

@ -1023,7 +1023,7 @@ impl Node {
.node_from_nodes_and_strings(nodes, can_gc)?; .node_from_nodes_and_strings(nodes, can_gc)?;
if self.parent_node == Some(&*parent) { if self.parent_node == Some(&*parent) {
// Step 5. // Step 5.
parent.ReplaceChild(&node, self)?; parent.ReplaceChild(&node, self, can_gc)?;
} else { } else {
// Step 6. // Step 6.
Node::pre_insert(&node, &parent, viable_next_sibling.as_deref(), can_gc)?; Node::pre_insert(&node, &parent, viable_next_sibling.as_deref(), can_gc)?;
@ -1047,7 +1047,7 @@ impl Node {
let doc = self.owner_doc(); let doc = self.owner_doc();
let node = doc.node_from_nodes_and_strings(nodes, can_gc)?; let node = doc.node_from_nodes_and_strings(nodes, can_gc)?;
// Step 2. // Step 2.
self.AppendChild(&node).map(|_| ()) self.AppendChild(&node, can_gc).map(|_| ())
} }
/// <https://dom.spec.whatwg.org/#dom-parentnode-replacechildren> /// <https://dom.spec.whatwg.org/#dom-parentnode-replacechildren>
@ -1226,7 +1226,7 @@ impl Node {
.to_string() .to_string()
} }
pub(crate) fn summarize(&self) -> NodeInfo { pub(crate) fn summarize(&self, can_gc: CanGc) -> NodeInfo {
let USVString(base_uri) = self.BaseURI(); let USVString(base_uri) = self.BaseURI();
let node_type = self.NodeType(); let node_type = self.NodeType();
@ -1246,9 +1246,9 @@ impl Node {
let num_children = if is_shadow_host { let num_children = if is_shadow_host {
// Shadow roots count as children // Shadow roots count as children
self.ChildNodes().Length() as usize + 1 self.ChildNodes(can_gc).Length() as usize + 1
} else { } else {
self.ChildNodes().Length() as usize self.ChildNodes(can_gc).Length() as usize
}; };
let window = self.owner_window(); let window = self.owner_window();
@ -1282,7 +1282,7 @@ impl Node {
index: i32, index: i32,
get_items: F, get_items: F,
new_child: G, new_child: G,
_can_gc: CanGc, can_gc: CanGc,
) -> Fallible<DomRoot<HTMLElement>> ) -> Fallible<DomRoot<HTMLElement>>
where where
F: Fn() -> DomRoot<HTMLCollection>, F: Fn() -> DomRoot<HTMLCollection>,
@ -1298,7 +1298,7 @@ impl Node {
{ {
let tr_node = tr.upcast::<Node>(); let tr_node = tr.upcast::<Node>();
if index == -1 { if index == -1 {
self.InsertBefore(tr_node, None)?; self.InsertBefore(tr_node, None, can_gc)?;
} else { } else {
let items = get_items(); let items = get_items();
let node = match items let node = match items
@ -1311,7 +1311,7 @@ impl Node {
None => return Err(Error::IndexSize), None => return Err(Error::IndexSize),
Some(node) => node, Some(node) => node,
}; };
self.InsertBefore(tr_node, node.as_deref())?; self.InsertBefore(tr_node, node.as_deref(), can_gc)?;
} }
} }
@ -2255,7 +2255,7 @@ impl Node {
parent, parent,
reference_child, reference_child,
SuppressObserver::Unsuppressed, SuppressObserver::Unsuppressed,
CanGc::note(), can_gc,
); );
// Step 6. // Step 6.
@ -3028,11 +3028,11 @@ impl NodeMethods<crate::DomTypeHolder> for Node {
} }
/// <https://dom.spec.whatwg.org/#dom-node-childnodes> /// <https://dom.spec.whatwg.org/#dom-node-childnodes>
fn ChildNodes(&self) -> DomRoot<NodeList> { fn ChildNodes(&self, can_gc: CanGc) -> DomRoot<NodeList> {
self.ensure_rare_data().child_list.or_init(|| { self.ensure_rare_data().child_list.or_init(|| {
let doc = self.owner_doc(); let doc = self.owner_doc();
let window = doc.window(); let window = doc.window();
NodeList::new_child_list(window, self, CanGc::note()) NodeList::new_child_list(window, self, can_gc)
}) })
} }
@ -3068,11 +3068,11 @@ impl NodeMethods<crate::DomTypeHolder> for Node {
} }
/// <https://dom.spec.whatwg.org/#dom-node-nodevalue> /// <https://dom.spec.whatwg.org/#dom-node-nodevalue>
fn SetNodeValue(&self, val: Option<DOMString>) { fn SetNodeValue(&self, val: Option<DOMString>, can_gc: CanGc) {
match self.type_id() { match self.type_id() {
NodeTypeId::Attr => { NodeTypeId::Attr => {
let attr = self.downcast::<Attr>().unwrap(); let attr = self.downcast::<Attr>().unwrap();
attr.SetValue(val.unwrap_or_default()); attr.SetValue(val.unwrap_or_default(), can_gc);
}, },
NodeTypeId::CharacterData(_) => { NodeTypeId::CharacterData(_) => {
let character_data = self.downcast::<CharacterData>().unwrap(); let character_data = self.downcast::<CharacterData>().unwrap();
@ -3118,7 +3118,7 @@ impl NodeMethods<crate::DomTypeHolder> for Node {
}, },
NodeTypeId::Attr => { NodeTypeId::Attr => {
let attr = self.downcast::<Attr>().unwrap(); let attr = self.downcast::<Attr>().unwrap();
attr.SetValue(value); attr.SetValue(value, can_gc);
}, },
NodeTypeId::CharacterData(..) => { NodeTypeId::CharacterData(..) => {
let characterdata = self.downcast::<CharacterData>().unwrap(); let characterdata = self.downcast::<CharacterData>().unwrap();
@ -3129,17 +3129,22 @@ impl NodeMethods<crate::DomTypeHolder> for Node {
} }
/// <https://dom.spec.whatwg.org/#dom-node-insertbefore> /// <https://dom.spec.whatwg.org/#dom-node-insertbefore>
fn InsertBefore(&self, node: &Node, child: Option<&Node>) -> Fallible<DomRoot<Node>> { fn InsertBefore(
Node::pre_insert(node, self, child, CanGc::note()) &self,
node: &Node,
child: Option<&Node>,
can_gc: CanGc,
) -> Fallible<DomRoot<Node>> {
Node::pre_insert(node, self, child, can_gc)
} }
/// <https://dom.spec.whatwg.org/#dom-node-appendchild> /// <https://dom.spec.whatwg.org/#dom-node-appendchild>
fn AppendChild(&self, node: &Node) -> Fallible<DomRoot<Node>> { fn AppendChild(&self, node: &Node, can_gc: CanGc) -> Fallible<DomRoot<Node>> {
Node::pre_insert(node, self, None, CanGc::note()) Node::pre_insert(node, self, None, can_gc)
} }
/// <https://dom.spec.whatwg.org/#concept-node-replace> /// <https://dom.spec.whatwg.org/#concept-node-replace>
fn ReplaceChild(&self, node: &Node, child: &Node) -> Fallible<DomRoot<Node>> { fn ReplaceChild(&self, node: &Node, child: &Node, can_gc: CanGc) -> Fallible<DomRoot<Node>> {
// Step 1. // Step 1.
match self.type_id() { match self.type_id() {
NodeTypeId::Document(_) | NodeTypeId::DocumentFragment(_) | NodeTypeId::Element(..) => { NodeTypeId::Document(_) | NodeTypeId::DocumentFragment(_) | NodeTypeId::Element(..) => {
@ -3237,11 +3242,11 @@ impl NodeMethods<crate::DomTypeHolder> for Node {
// Step 10. // Step 10.
let document = self.owner_document(); let document = self.owner_document();
Node::adopt(node, &document, CanGc::note()); Node::adopt(node, &document, can_gc);
let removed_child = if node != child { let removed_child = if node != child {
// Step 11. // Step 11.
Node::remove(child, self, SuppressObserver::Suppressed, CanGc::note()); Node::remove(child, self, SuppressObserver::Suppressed, can_gc);
Some(child) Some(child)
} else { } else {
None None
@ -3265,7 +3270,7 @@ impl NodeMethods<crate::DomTypeHolder> for Node {
self, self,
reference_child, reference_child,
SuppressObserver::Suppressed, SuppressObserver::Suppressed,
CanGc::note(), can_gc,
); );
// Step 14. // Step 14.
@ -3290,19 +3295,19 @@ impl NodeMethods<crate::DomTypeHolder> for Node {
} }
/// <https://dom.spec.whatwg.org/#dom-node-removechild> /// <https://dom.spec.whatwg.org/#dom-node-removechild>
fn RemoveChild(&self, node: &Node) -> Fallible<DomRoot<Node>> { fn RemoveChild(&self, node: &Node, can_gc: CanGc) -> Fallible<DomRoot<Node>> {
Node::pre_remove(node, self, CanGc::note()) Node::pre_remove(node, self, can_gc)
} }
/// <https://dom.spec.whatwg.org/#dom-node-normalize> /// <https://dom.spec.whatwg.org/#dom-node-normalize>
fn Normalize(&self) { fn Normalize(&self, can_gc: CanGc) {
let mut children = self.children().enumerate().peekable(); let mut children = self.children().enumerate().peekable();
while let Some((_, node)) = children.next() { while let Some((_, node)) = children.next() {
if let Some(text) = node.downcast::<Text>() { if let Some(text) = node.downcast::<Text>() {
let cdata = text.upcast::<CharacterData>(); let cdata = text.upcast::<CharacterData>();
let mut length = cdata.Length(); let mut length = cdata.Length();
if length == 0 { if length == 0 {
Node::remove(&node, self, SuppressObserver::Unsuppressed, CanGc::note()); Node::remove(&node, self, SuppressObserver::Unsuppressed, can_gc);
continue; continue;
} }
while children while children
@ -3318,15 +3323,10 @@ impl NodeMethods<crate::DomTypeHolder> for Node {
let sibling_cdata = sibling.downcast::<CharacterData>().unwrap(); let sibling_cdata = sibling.downcast::<CharacterData>().unwrap();
length += sibling_cdata.Length(); length += sibling_cdata.Length();
cdata.append_data(&sibling_cdata.data()); cdata.append_data(&sibling_cdata.data());
Node::remove( Node::remove(&sibling, self, SuppressObserver::Unsuppressed, can_gc);
&sibling,
self,
SuppressObserver::Unsuppressed,
CanGc::note(),
);
} }
} else { } else {
node.Normalize(); node.Normalize(can_gc);
} }
} }
} }

36
components/script/dom/range.rs
View file

@ -596,7 +596,7 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
.unwrap(); .unwrap();
let clone = cdata.clone_with_data(data, &start_node.owner_doc(), can_gc); let clone = cdata.clone_with_data(data, &start_node.owner_doc(), can_gc);
// Step 4.3. // Step 4.3.
fragment.upcast::<Node>().AppendChild(&clone)?; fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
// Step 4.4 // Step 4.4
return Ok(fragment); return Ok(fragment);
} }
@ -619,12 +619,12 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
.unwrap(); .unwrap();
let clone = cdata.clone_with_data(data, &start_node.owner_doc(), can_gc); let clone = cdata.clone_with_data(data, &start_node.owner_doc(), can_gc);
// Step 13.3. // Step 13.3.
fragment.upcast::<Node>().AppendChild(&clone)?; fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
} else { } else {
// Step 14.1. // Step 14.1.
let clone = child.CloneNode(/* deep */ false, can_gc)?; let clone = child.CloneNode(/* deep */ false, can_gc)?;
// Step 14.2. // Step 14.2.
fragment.upcast::<Node>().AppendChild(&clone)?; fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
// Step 14.3. // Step 14.3.
let subrange = Range::new( let subrange = Range::new(
&clone.owner_doc(), &clone.owner_doc(),
@ -637,7 +637,7 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
// Step 14.4. // Step 14.4.
let subfragment = subrange.CloneContents(can_gc)?; let subfragment = subrange.CloneContents(can_gc)?;
// Step 14.5. // Step 14.5.
clone.AppendChild(subfragment.upcast())?; clone.AppendChild(subfragment.upcast(), can_gc)?;
} }
} }
@ -646,7 +646,7 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
// Step 15.1. // Step 15.1.
let clone = child.CloneNode(/* deep */ true, can_gc)?; let clone = child.CloneNode(/* deep */ true, can_gc)?;
// Step 15.2. // Step 15.2.
fragment.upcast::<Node>().AppendChild(&clone)?; fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
} }
if let Some(child) = last_partially_contained_child { if let Some(child) = last_partially_contained_child {
@ -657,19 +657,19 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
let data = cdata.SubstringData(0, end_offset).unwrap(); let data = cdata.SubstringData(0, end_offset).unwrap();
let clone = cdata.clone_with_data(data, &start_node.owner_doc(), can_gc); let clone = cdata.clone_with_data(data, &start_node.owner_doc(), can_gc);
// Step 16.3. // Step 16.3.
fragment.upcast::<Node>().AppendChild(&clone)?; fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
} else { } else {
// Step 17.1. // Step 17.1.
let clone = child.CloneNode(/* deep */ false, can_gc)?; let clone = child.CloneNode(/* deep */ false, can_gc)?;
// Step 17.2. // Step 17.2.
fragment.upcast::<Node>().AppendChild(&clone)?; fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
// Step 17.3. // Step 17.3.
let subrange = let subrange =
Range::new(&clone.owner_doc(), &child, 0, &end_node, end_offset, can_gc); Range::new(&clone.owner_doc(), &child, 0, &end_node, end_offset, can_gc);
// Step 17.4. // Step 17.4.
let subfragment = subrange.CloneContents(can_gc)?; let subfragment = subrange.CloneContents(can_gc)?;
// Step 17.5. // Step 17.5.
clone.AppendChild(subfragment.upcast())?; clone.AppendChild(subfragment.upcast(), can_gc)?;
} }
} }
@ -705,7 +705,7 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
.unwrap() .unwrap()
.SetData(text.unwrap()); .SetData(text.unwrap());
// Step 4.3. // Step 4.3.
fragment.upcast::<Node>().AppendChild(&clone)?; fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
// Step 4.4. // Step 4.4.
end_data.ReplaceData(start_offset, end_offset - start_offset, DOMString::new())?; end_data.ReplaceData(start_offset, end_offset - start_offset, DOMString::new())?;
// Step 4.5. // Step 4.5.
@ -749,7 +749,7 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
.unwrap() .unwrap()
.SetData(text.unwrap()); .SetData(text.unwrap());
// Step 15.3. // Step 15.3.
fragment.upcast::<Node>().AppendChild(&clone)?; fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
// Step 15.4. // Step 15.4.
start_data.ReplaceData( start_data.ReplaceData(
start_offset, start_offset,
@ -760,7 +760,7 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
// Step 16.1. // Step 16.1.
let clone = child.CloneNode(/* deep */ false, can_gc)?; let clone = child.CloneNode(/* deep */ false, can_gc)?;
// Step 16.2. // Step 16.2.
fragment.upcast::<Node>().AppendChild(&clone)?; fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
// Step 16.3. // Step 16.3.
let subrange = Range::new( let subrange = Range::new(
&clone.owner_doc(), &clone.owner_doc(),
@ -773,13 +773,13 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
// Step 16.4. // Step 16.4.
let subfragment = subrange.ExtractContents(can_gc)?; let subfragment = subrange.ExtractContents(can_gc)?;
// Step 16.5. // Step 16.5.
clone.AppendChild(subfragment.upcast())?; clone.AppendChild(subfragment.upcast(), can_gc)?;
} }
} }
// Step 17. // Step 17.
for child in contained_children { for child in contained_children {
fragment.upcast::<Node>().AppendChild(&child)?; fragment.upcast::<Node>().AppendChild(&child, can_gc)?;
} }
if let Some(child) = last_partially_contained_child { if let Some(child) = last_partially_contained_child {
@ -794,21 +794,21 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
.unwrap() .unwrap()
.SetData(text.unwrap()); .SetData(text.unwrap());
// Step 18.3. // Step 18.3.
fragment.upcast::<Node>().AppendChild(&clone)?; fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
// Step 18.4. // Step 18.4.
end_data.ReplaceData(0, end_offset, DOMString::new())?; end_data.ReplaceData(0, end_offset, DOMString::new())?;
} else { } else {
// Step 19.1. // Step 19.1.
let clone = child.CloneNode(/* deep */ false, can_gc)?; let clone = child.CloneNode(/* deep */ false, can_gc)?;
// Step 19.2. // Step 19.2.
fragment.upcast::<Node>().AppendChild(&clone)?; fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
// Step 19.3. // Step 19.3.
let subrange = let subrange =
Range::new(&clone.owner_doc(), &child, 0, &end_node, end_offset, can_gc); Range::new(&clone.owner_doc(), &child, 0, &end_node, end_offset, can_gc);
// Step 19.4. // Step 19.4.
let subfragment = subrange.ExtractContents(can_gc)?; let subfragment = subrange.ExtractContents(can_gc)?;
// Step 19.5. // Step 19.5.
clone.AppendChild(subfragment.upcast())?; clone.AppendChild(subfragment.upcast(), can_gc)?;
} }
} }
@ -856,7 +856,7 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
}, },
_ => { _ => {
// Steps 4-5. // Steps 4-5.
let child = start_node.ChildNodes().Item(start_offset); let child = start_node.ChildNodes(can_gc).Item(start_offset);
(child, DomRoot::from_ref(&*start_node)) (child, DomRoot::from_ref(&*start_node))
}, },
}; };
@ -1029,7 +1029,7 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
self.InsertNode(new_parent, can_gc)?; self.InsertNode(new_parent, can_gc)?;
// Step 6. // Step 6.
new_parent.AppendChild(fragment.upcast())?; new_parent.AppendChild(fragment.upcast(), can_gc)?;
// Step 7. // Step 7.
self.SelectNode(new_parent) self.SelectNode(new_parent)

6
components/script/dom/servoparser/async_html.rs
View file

@ -484,7 +484,7 @@ impl Tokenizer {
document document
.upcast::<Node>() .upcast::<Node>()
.AppendChild(doctype.upcast()) .AppendChild(doctype.upcast(), can_gc)
.expect("Appending failed"); .expect("Appending failed");
}, },
ParseOperation::AddAttrsIfMissing { target, attrs } => { ParseOperation::AddAttrsIfMissing { target, attrs } => {
@ -503,7 +503,7 @@ impl Tokenizer {
}, },
ParseOperation::RemoveFromParent { target } => { ParseOperation::RemoveFromParent { target } => {
if let Some(ref parent) = self.get_node(&target).GetParentNode() { if let Some(ref parent) = self.get_node(&target).GetParentNode() {
parent.RemoveChild(&self.get_node(&target)).unwrap(); parent.RemoveChild(&self.get_node(&target), can_gc).unwrap();
} }
}, },
ParseOperation::MarkScriptAlreadyStarted { node } => { ParseOperation::MarkScriptAlreadyStarted { node } => {
@ -517,7 +517,7 @@ impl Tokenizer {
let parent = self.get_node(&parent); let parent = self.get_node(&parent);
let new_parent = self.get_node(&new_parent); let new_parent = self.get_node(&new_parent);
while let Some(child) = parent.GetFirstChild() { while let Some(child) = parent.GetFirstChild() {
new_parent.AppendChild(&child).unwrap(); new_parent.AppendChild(&child, can_gc).unwrap();
} }
}, },
ParseOperation::AssociateWithForm { ParseOperation::AssociateWithForm {

14
components/script/dom/servoparser/mod.rs
View file

@ -913,7 +913,7 @@ impl FetchResponseListener for ParserContext {
let img = HTMLImageElement::new(local_name!("img"), None, doc, None, CanGc::note()); let img = HTMLImageElement::new(local_name!("img"), None, doc, None, CanGc::note());
img.SetSrc(USVString(self.url.to_string())); img.SetSrc(USVString(self.url.to_string()));
doc_body doc_body
.AppendChild(&DomRoot::upcast::<Node>(img)) .AppendChild(&DomRoot::upcast::<Node>(img), CanGc::note())
.expect("Appending failed"); .expect("Appending failed");
}, },
(mime::TEXT, mime::PLAIN, _) => { (mime::TEXT, mime::PLAIN, _) => {
@ -1095,7 +1095,7 @@ fn insert(
if element_in_non_fragment { if element_in_non_fragment {
ScriptThread::push_new_element_queue(); ScriptThread::push_new_element_queue();
} }
parent.InsertBefore(&n, reference_child).unwrap(); parent.InsertBefore(&n, reference_child, can_gc).unwrap();
if element_in_non_fragment { if element_in_non_fragment {
ScriptThread::pop_current_element_queue(can_gc); ScriptThread::pop_current_element_queue(can_gc);
} }
@ -1111,7 +1111,9 @@ fn insert(
text.upcast::<CharacterData>().append_data(&t); text.upcast::<CharacterData>().append_data(&t);
} else { } else {
let text = Text::new(String::from(t).into(), &parent.owner_doc(), can_gc); let text = Text::new(String::from(t).into(), &parent.owner_doc(), can_gc);
parent.InsertBefore(text.upcast(), reference_child).unwrap(); parent
.InsertBefore(text.upcast(), reference_child, can_gc)
.unwrap();
} }
}, },
} }
@ -1323,7 +1325,7 @@ impl TreeSink for Sink {
CanGc::note(), CanGc::note(),
); );
doc.upcast::<Node>() doc.upcast::<Node>()
.AppendChild(doctype.upcast()) .AppendChild(doctype.upcast(), CanGc::note())
.expect("Appending failed"); .expect("Appending failed");
} }
@ -1343,7 +1345,7 @@ impl TreeSink for Sink {
fn remove_from_parent(&self, target: &Dom<Node>) { fn remove_from_parent(&self, target: &Dom<Node>) {
if let Some(ref parent) = target.GetParentNode() { if let Some(ref parent) = target.GetParentNode() {
parent.RemoveChild(target).unwrap(); parent.RemoveChild(target, CanGc::note()).unwrap();
} }
} }
@ -1365,7 +1367,7 @@ impl TreeSink for Sink {
fn reparent_children(&self, node: &Dom<Node>, new_parent: &Dom<Node>) { fn reparent_children(&self, node: &Dom<Node>, new_parent: &Dom<Node>) {
while let Some(ref child) = node.GetFirstChild() { while let Some(ref child) = node.GetFirstChild() {
new_parent.AppendChild(child).unwrap(); new_parent.AppendChild(child, CanGc::note()).unwrap();
} }
} }

2
components/script/dom/text.rs
View file

@ -89,7 +89,7 @@ impl TextMethods<crate::DomTypeHolder> for Text {
if let Some(ref parent) = parent { if let Some(ref parent) = parent {
// Step 7.1. // Step 7.1.
parent parent
.InsertBefore(new_node.upcast(), node.GetNextSibling().as_deref()) .InsertBefore(new_node.upcast(), node.GetNextSibling().as_deref(), can_gc)
.unwrap(); .unwrap();
// Steps 7.2-3. // Steps 7.2-3.
node.ranges() node.ranges()

6
components/script_bindings/codegen/Bindings.conf
View file

@ -18,6 +18,10 @@ DOMInterfaces = {
'weakReferenceable': True, 'weakReferenceable': True,
}, },
'Attr': {
'canGc':['SetValue'],
},
'AudioBuffer': { 'AudioBuffer': {
'canGc':['CopyToChannel', 'GetChannelData'], 'canGc':['CopyToChannel', 'GetChannelData'],
}, },
@ -452,7 +456,7 @@ DOMInterfaces = {
}, },
'Node': { 'Node': {
'canGc': ['CloneNode', 'SetTextContent'], 'canGc': ['AppendChild', 'ChildNodes', 'CloneNode', 'InsertBefore', 'Normalize', 'SetNodeValue', 'SetTextContent', 'RemoveChild', 'ReplaceChild'],
}, },
'NodeIterator': { 'NodeIterator': {