Permalink
Browse files

Auto merge of #22669 - georgeroman:ignore_children_of_void_when_seria…

…lizing, 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 -->
  • Loading branch information...
bors-servo committed Jan 10, 2019
2 parents 4ac5b8a + f7db574 commit 160842b8c15ef328ec380f9f69403d88372bafde
@@ -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 {
Oops, something went wrong.

1 comment on commit 160842b

@taskcluster

This comment has been minimized.

Copy link

taskcluster bot commented on 160842b Jan 10, 2019

Submitting the task to Taskcluster failed. Details

InterpreterError at template.tasks[0]: object keys must be strings

Please sign in to comment.