зеркало из https://github.com/mozilla/gecko-dev.git
servo: Merge #6783 - Clean up Node::ReplaceChild (from dzbarsky:replacechild); r=Ms2ger
Source-Repo: https://github.com/servo/servo Source-Revision: 9e8d231196693a660a1e70d535d1c3ab290ddf39
This commit is contained in:
Родитель
1eb9c7fff1
Коммит
cd7cafe51e
|
@ -2153,22 +2153,18 @@ impl<'a> NodeMethods for &'a Node {
|
|||
NodeTypeId::CharacterData(CharacterDataTypeId::Text) if self.is_document() =>
|
||||
return Err(HierarchyRequest),
|
||||
NodeTypeId::DocumentType if !self.is_document() => return Err(HierarchyRequest),
|
||||
NodeTypeId::DocumentFragment |
|
||||
NodeTypeId::DocumentType |
|
||||
NodeTypeId::Element(..) |
|
||||
NodeTypeId::CharacterData(..) => (),
|
||||
NodeTypeId::Document => return Err(HierarchyRequest)
|
||||
NodeTypeId::Document => return Err(HierarchyRequest),
|
||||
_ => ()
|
||||
}
|
||||
|
||||
// Step 6.
|
||||
match self.type_id {
|
||||
NodeTypeId::Document => {
|
||||
if self.is_document() {
|
||||
match node.type_id() {
|
||||
// Step 6.1
|
||||
NodeTypeId::DocumentFragment => {
|
||||
// Step 6.1.1(b)
|
||||
if node.children()
|
||||
.any(|c| c.r().is_text())
|
||||
.any(|c| c.is_text())
|
||||
{
|
||||
return Err(HierarchyRequest);
|
||||
}
|
||||
|
@ -2181,7 +2177,7 @@ impl<'a> NodeMethods for &'a Node {
|
|||
return Err(HierarchyRequest);
|
||||
}
|
||||
if child.following_siblings()
|
||||
.any(|child| child.r().is_doctype()) {
|
||||
.any(|child| child.is_doctype()) {
|
||||
return Err(HierarchyRequest);
|
||||
}
|
||||
},
|
||||
|
@ -2196,7 +2192,7 @@ impl<'a> NodeMethods for &'a Node {
|
|||
return Err(HierarchyRequest);
|
||||
}
|
||||
if child.following_siblings()
|
||||
.any(|child| child.r().is_doctype())
|
||||
.any(|child| child.is_doctype())
|
||||
{
|
||||
return Err(HierarchyRequest);
|
||||
}
|
||||
|
@ -2204,14 +2200,14 @@ impl<'a> NodeMethods for &'a Node {
|
|||
// Step 6.3
|
||||
NodeTypeId::DocumentType => {
|
||||
if self.children()
|
||||
.any(|c| c.r().is_doctype() &&
|
||||
.any(|c| c.is_doctype() &&
|
||||
c.r() != child)
|
||||
{
|
||||
return Err(HierarchyRequest);
|
||||
}
|
||||
if self.children()
|
||||
.take_while(|c| c.r() != child)
|
||||
.any(|c| c.r().is_element())
|
||||
.any(|c| c.is_element())
|
||||
{
|
||||
return Err(HierarchyRequest);
|
||||
}
|
||||
|
@ -2219,8 +2215,6 @@ impl<'a> NodeMethods for &'a Node {
|
|||
NodeTypeId::CharacterData(..) => (),
|
||||
NodeTypeId::Document => unreachable!()
|
||||
}
|
||||
},
|
||||
_ => ()
|
||||
}
|
||||
|
||||
// Ok if not caught by previous error checks.
|
||||
|
@ -2229,8 +2223,8 @@ impl<'a> NodeMethods for &'a Node {
|
|||
}
|
||||
|
||||
// Step 7-8.
|
||||
let child_next_sibling = child.next_sibling.get().map(Root::from_rooted);
|
||||
let node_next_sibling = node.next_sibling.get().map(Root::from_rooted);
|
||||
let child_next_sibling = child.GetNextSibling();
|
||||
let node_next_sibling = node.GetNextSibling();
|
||||
let reference_child = if child_next_sibling.r() == Some(node) {
|
||||
node_next_sibling.r()
|
||||
} else {
|
||||
|
|
Загрузка…
Ссылка в новой задаче