mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Auto merge of #22669 - georgeroman:ignore_children_of_void_when_serializing, r=jdm
Ignore children of void elements when serializing <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #22607 <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22669) <!-- Reviewable:end -->
This commit is contained in:
bors-servo
GitHub
commit
160842b8c1
2 changed files with 4 additions and 406 deletions
|
|
@ -153,6 +153,10 @@ struct SerializationIterator {
|
|||
}
|
||||
|
||||
fn rev_children_iter(n: &Node) -> impl Iterator<Item = DomRoot<Node>> {
|
||||
if n.downcast::<Element>().map_or(false, |e| e.is_void()) {
|
||||
return Node::new_document_node().rev_children();
|
||||
}
|
||||
|
||||
match n.downcast::<HTMLTemplateElement>() {
|
||||
Some(t) => t.Content().upcast::<Node>().rev_children(),
|
||||
None => n.rev_children(),
|
||||
|
|
@ -210,12 +214,6 @@ impl<'a> Serialize for &'a Node {
|
|||
) -> io::Result<()> {
|
||||
let node = *self;
|
||||
|
||||
if let TraversalScope::ChildrenOnly(_) = traversal_scope {
|
||||
if node.downcast::<Element>().map_or(false, |e| e.is_void()) {
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
|
||||
let iter = SerializationIterator::new(node, traversal_scope != IncludeNode);
|
||||
|
||||
for cmd in iter {
|
||||
|
|
|
|||
|
|
@ -5,403 +5,3 @@
|
|||
|
||||
[outerHTML Attribute in non-standard namespace]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings area]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings base]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings basefont]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings bgsound]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings br]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings col]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings embed]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings frame]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings hr]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings img]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings input]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings keygen]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings link]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings menuitem]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings meta]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings param]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings source]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings track]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as first child with following siblings wbr]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings area]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings base]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings basefont]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings bgsound]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings br]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings col]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings embed]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings frame]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings hr]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings img]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings input]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings keygen]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings link]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings menuitem]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings meta]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings param]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings source]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings track]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as second child with following siblings wbr]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings area]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings base]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings basefont]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings bgsound]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings br]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings col]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings embed]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings frame]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings hr]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings img]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings input]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings keygen]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings link]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings menuitem]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings meta]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings param]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings source]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings track]
|
||||
expected: FAIL
|
||||
|
||||
[innerHTML void as last child with preceding siblings wbr]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node area]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node base]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node basefont]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node bgsound]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node br]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node col]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node embed]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node frame]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node hr]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node img]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node input]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node keygen]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node link]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node menuitem]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node meta]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node param]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node source]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node track]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML Void context node wbr]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings area]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings base]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings basefont]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings bgsound]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings br]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings col]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings embed]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings frame]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings hr]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings img]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings input]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings keygen]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings link]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings menuitem]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings meta]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings param]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings source]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings track]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as first child with following siblings wbr]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings area]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings base]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings basefont]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings bgsound]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings br]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings col]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings embed]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings frame]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings hr]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings img]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings input]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings keygen]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings link]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings menuitem]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings meta]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings param]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings source]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings track]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as second child with following siblings wbr]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings area]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings base]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings basefont]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings bgsound]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings br]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings col]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings embed]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings frame]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings hr]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings img]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings input]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings keygen]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings link]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings menuitem]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings meta]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings param]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings source]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings track]
|
||||
expected: FAIL
|
||||
|
||||
[outerHTML void as last child with preceding siblings wbr]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue