Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #22542 - georgeroman:serialize_children_of_void_as_empty_strings, r=jdm

Browse source 
Serialize the children of void html elements as empty strings

<!-- 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 #22502  (GitHub issue number if applicable)

<!-- 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/22542)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-01-03 16:24:49 -05:00 • committed by GitHub
commit 7c34a70ca8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/script/dom/element.rs
View file

@ -1097,7 +1097,6 @@ impl Element {
local_name!("input") |
local_name!("keygen") |
local_name!("link") |
local_name!("menuitem") |
local_name!("meta") |
local_name!("param") |
local_name!("source") |

6
components/script/dom/servoparser/html.rs
View file

@ -210,6 +210,12 @@ 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 {

57
tests/wpt/metadata/html/syntax/serializing-html-fragments/serializing.html.ini
View file

@ -6,63 +6,6 @@
[outerHTML Attribute in non-standard namespace]
expected: FAIL
[innerHTML Void context node area]
expected: FAIL
[innerHTML Void context node base]
expected: FAIL
[innerHTML Void context node basefont]
expected: FAIL
[innerHTML Void context node bgsound]
expected: FAIL
[innerHTML Void context node br]
expected: FAIL
[innerHTML Void context node col]
expected: FAIL
[innerHTML Void context node embed]
expected: FAIL
[innerHTML Void context node frame]
expected: FAIL
[innerHTML Void context node hr]
expected: FAIL
[innerHTML Void context node img]
expected: FAIL
[innerHTML Void context node input]
expected: FAIL
[innerHTML Void context node keygen]
expected: FAIL
[innerHTML Void context node link]
expected: FAIL
[innerHTML Void context node menuitem]
expected: FAIL
[innerHTML Void context node meta]
expected: FAIL
[innerHTML Void context node param]
expected: FAIL
[innerHTML Void context node source]
expected: FAIL
[innerHTML Void context node track]
expected: FAIL
[innerHTML Void context node wbr]
expected: FAIL
[innerHTML void as first child with following siblings area]
expected: FAIL