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

Introduce concept of composed parent node

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2019-01-29 11:00:14 +01:00
parent 1b036355ce
commit c48ad0ff7e
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -108,6 +108,9 @@ pub struct Node {
/// The parent of this node. /// The parent of this node.
parent_node: MutNullableDom<Node>, parent_node: MutNullableDom<Node>,
/// The parent of this node, ignoring shadow roots.
composed_parent_node: MutNullableDom<Node>,
/// The first child of this node. /// The first child of this node.
first_child: MutNullableDom<Node>, first_child: MutNullableDom<Node>,
@ -240,6 +243,7 @@ impl Node {
/// Fails unless `new_child` is disconnected from the tree. /// Fails unless `new_child` is disconnected from the tree.
fn add_child(&self, new_child: &Node, before: Option<&Node>) { fn add_child(&self, new_child: &Node, before: Option<&Node>) {
assert!(new_child.parent_node.get().is_none()); assert!(new_child.parent_node.get().is_none());
assert!(new_child.composed_parent_node.get().is_none());
assert!(new_child.prev_sibling.get().is_none()); assert!(new_child.prev_sibling.get().is_none());
assert!(new_child.next_sibling.get().is_none()); assert!(new_child.next_sibling.get().is_none());
match before { match before {
@ -275,6 +279,11 @@ impl Node {
} }
new_child.parent_node.set(Some(self)); new_child.parent_node.set(Some(self));
if let Some(shadow_root) = self.downcast::<ShadowRoot>() {
new_child.composed_parent_node.set(Some(shadow_root.Host().upcast::<Node>()));
} else {
new_child.composed_parent_node.set(Some(self));
}
self.children_count.set(self.children_count.get() + 1); self.children_count.set(self.children_count.get() + 1);
let parent_in_doc = self.is_in_doc(); let parent_in_doc = self.is_in_doc();
@ -341,6 +350,7 @@ impl Node {
child.prev_sibling.set(None); child.prev_sibling.set(None);
child.next_sibling.set(None); child.next_sibling.set(None);
child.parent_node.set(None); child.parent_node.set(None);
child.composed_parent_node.set(None);
self.children_count.set(self.children_count.get() - 1); self.children_count.set(self.children_count.get() - 1);
for node in child.traverse_preorder() { for node in child.traverse_preorder() {
@ -599,7 +609,7 @@ impl Node {
match self.type_id() { match self.type_id() {
NodeTypeId::CharacterData(CharacterDataTypeId::Text(TextTypeId::Text)) => self NodeTypeId::CharacterData(CharacterDataTypeId::Text(TextTypeId::Text)) => self
.parent_node .composed_parent_node
.get() .get()
.unwrap() .unwrap()
.downcast::<Element>() .downcast::<Element>()
@ -1581,6 +1591,7 @@ impl Node {
eventtarget: EventTarget::new_inherited(), eventtarget: EventTarget::new_inherited(),
parent_node: Default::default(), parent_node: Default::default(),
composed_parent_node: Default::default(),
first_child: Default::default(), first_child: Default::default(),
last_child: Default::default(), last_child: Default::default(),
next_sibling: Default::default(), next_sibling: Default::default(),