diff options
author | Fernando Jiménez Moreno <ferjmoreno@gmail.com> | 2018-02-20 10:49:50 +0100 |
---|---|---|
committer | Fernando Jiménez Moreno <ferjmoreno@gmail.com> | 2018-02-20 13:50:53 +0100 |
commit | ff817079281efe982bb6cc26c230824a3628271b (patch) | |
tree | 493b167fff3f4a6ae1bc6fd2edb1af7bbc631896 /components/layout/query.rs | |
parent | 6a7ae3b12e5484dc1856f843028dda7b66007cfd (diff) | |
download | servo-ff817079281efe982bb6cc26c230824a3628271b.tar.gz servo-ff817079281efe982bb6cc26c230824a3628271b.zip |
Minor cleanup of element.innerText
Diffstat (limited to 'components/layout/query.rs')
-rw-r--r-- | components/layout/query.rs | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/components/layout/query.rs b/components/layout/query.rs index 922254293f5..afe5b50d909 100644 --- a/components/layout/query.rs +++ b/components/layout/query.rs @@ -1009,15 +1009,16 @@ fn inner_text_collection_steps<N: LayoutNode>(node: N, }, Display::TableRow if !is_last_table_row() => { // Step 7. - items.push(InnerTextItem::Text(String::from("\u{000A}" /* line feed */))); + items.push(InnerTextItem::Text(String::from( + "\u{000A}", /* line feed */ + ))); }, - _ => (), - } - - // Step 9. - if is_block_level_or_table_caption(&display) { - items.insert(0, InnerTextItem::RequiredLineBreakCount(1)); - items.push(InnerTextItem::RequiredLineBreakCount(1)); + Display::Block | Display::Flex | Display::TableCaption | Display::Table => { + // Step 9. + items.insert(0, InnerTextItem::RequiredLineBreakCount(1)); + items.push(InnerTextItem::RequiredLineBreakCount(1)); + }, + _ => {}, } } @@ -1033,11 +1034,3 @@ fn is_last_table_row() -> bool { // FIXME(ferjm) Implement this. false } - -fn is_block_level_or_table_caption(display: &Display) -> bool { - match *display { - Display::Block | Display::Flex | - Display::TableCaption | Display::Table => true, - _ => false, - } -} |