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

Propagate CanGc from Document::new() (#33386)

Browse source 
* Add canGc as a parameter to autogenerated trait methods

Signed-off-by: Andriy Sultanov <sultanovandriy@gmail.com>

* Propagate CanGc from Document::new()

Signed-off-by: Andriy Sultanov <sultanovandriy@gmail.com>

---------

Signed-off-by: Andriy Sultanov <sultanovandriy@gmail.com>
This commit is contained in:
Andriy Sultanov 2024-09-09 23:38:01 +01:00 • committed by GitHub
parent 10e5bb72d9
commit e5150dbda1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
41 changed files with 704 additions and 393 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,7 @@ use crate::dom::documentfragment::DocumentFragment;
use crate::dom::htmlelement::HTMLElement;
use crate::dom::node::{document_from_node, CloneChildrenFlag, Node};
use crate::dom::virtualmethods::VirtualMethods;
use crate::script_runtime::CanGc;
#[dom_struct]
pub struct HTMLTemplateElement {
@ -59,10 +60,10 @@ impl HTMLTemplateElement {
impl HTMLTemplateElementMethods for HTMLTemplateElement {
/// <https://html.spec.whatwg.org/multipage/#dom-template-content>
fn Content(&self) -> DomRoot<DocumentFragment> {
fn Content(&self, can_gc: CanGc) -> DomRoot<DocumentFragment> {
self.contents.or_init(|| {
let doc = document_from_node(self);
doc.appropriate_template_contents_owner_document()
doc.appropriate_template_contents_owner_document(can_gc)
.CreateDocumentFragment()
})
}
@ -77,9 +78,10 @@ impl VirtualMethods for HTMLTemplateElement {
fn adopting_steps(&self, old_doc: &Document) {
self.super_type().unwrap().adopting_steps(old_doc);
// Step 1.
let doc = document_from_node(self).appropriate_template_contents_owner_document();
let doc =
document_from_node(self).appropriate_template_contents_owner_document(CanGc::note());
// Step 2.
Node::adopt(self.Content().upcast(), &doc);
Node::adopt(self.Content(CanGc::note()).upcast(), &doc);
}
/// <https://html.spec.whatwg.org/multipage/#the-template-element:concept-node-clone-ext>
@ -98,13 +100,14 @@ impl VirtualMethods for HTMLTemplateElement {
}
let copy = copy.downcast::<HTMLTemplateElement>().unwrap();
// Steps 2-3.
let copy_contents = DomRoot::upcast::<Node>(copy.Content());
let copy_contents = DomRoot::upcast::<Node>(copy.Content(CanGc::note()));
let copy_contents_doc = copy_contents.owner_doc();
for child in self.Content().upcast::<Node>().children() {
for child in self.Content(CanGc::note()).upcast::<Node>().children() {
let copy_child = Node::clone(
&child,
Some(&copy_contents_doc),
CloneChildrenFlag::CloneChildren,
CanGc::note(),
);
copy_contents.AppendChild(&copy_child).unwrap();
}