Minor cleanup of element.innerText

servo · Feb 20, 2018 · ff81707 · ff81707
1 parent 6a7ae3b
commit ff81707
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git 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,
-    }
-}
diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs
@@ -478,8 +478,7 @@ fn append_text_node_to_fragment(
     text: String
 ) {
     let text = Text::new(DOMString::from(text), document);
-    let node = DomRoot::upcast::<Node>(text);
-    fragment.upcast::<Node>().AppendChild(&node).unwrap();
+    fragment.upcast::<Node>().AppendChild(&text.upcast()).unwrap();
 }
 
 // https://html.spec.whatwg.org/multipage/#attr-data-*