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

auto merge of #1170 : Ms2ger/servo/pre-insert-document, r=jdm

Browse source
This commit is contained in:
bors-servo 2013-11-05 10:28:27 -08:00
commit a55cba04c6
1 changed files with 82 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

83
src/components/script/dom/node.rs
View file

@ -752,7 +752,88 @@ impl Node<ScriptView> {
}
// Step 6.
// XXX #838
match parent.type_id() {
DocumentNodeTypeId(_) => {
fn inclusively_followed_by_doctype(child: Option<AbstractNode<ScriptView>>) -> bool{
match child {
Some(child) if child.is_doctype() => true,
Some(child) => {
let mut iter = child;
loop {
match iter.next_sibling() {
Some(sibling) => {
if sibling.is_doctype() {
return true;
}
iter = sibling;
},
None => return false,
}
}
},
None => false,
}
}
match node.type_id() {
// Step 6.1
DocumentFragmentNodeTypeId => {
// Step 6.1.1(b)
if node.children().any(|c| c.is_text()) {
return Err(HierarchyRequest);
}
match node.children().count(|c| c.is_element()) {
0 => (),
// Step 6.1.2
1 => {
if parent.children().any(|c| c.is_element()) {
return Err(HierarchyRequest);
}
if inclusively_followed_by_doctype(child) {
return Err(HierarchyRequest);
}
},
// Step 6.1.1(a)
_ => return Err(HierarchyRequest),
}
},
// Step 6.2
ElementNodeTypeId(_) => {
if parent.children().any(|c| c.is_element()) {
return Err(HierarchyRequest);
}
if inclusively_followed_by_doctype(child) {
return Err(HierarchyRequest);
}
},
// Step 6.3
DoctypeNodeTypeId => {
if parent.children().any(|c| c.is_doctype()) {
return Err(HierarchyRequest);
}
match child {
Some(child) => {
if parent.children()
.take_while(|&c| c != child)
.any(|c| c.is_element()) {
return Err(HierarchyRequest);
}
},
None => {
if parent.children().any(|c| c.is_element()) {
return Err(HierarchyRequest);
}
},
}
},
TextNodeTypeId |
// ProcessingInstructionNodeTypeId |
CommentNodeTypeId => (),
DocumentNodeTypeId(_) => unreachable!(),
}
},
_ => (),
}
// Step 7-8.
let referenceChild = if child != Some(node) {