Simplify code for directionality

servo · Feb 24, 2020 · 35d340d · 35d340d
1 parent edb940e
commit 35d340d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
@@ -543,15 +543,12 @@ impl Element {
 
     // https://html.spec.whatwg.org/multipage/#the-directionality
     pub fn directionality(&self) -> String {
-        if let Some(directionality) = self
-            .downcast::<HTMLElement>()
+        self.downcast::<HTMLElement>()
             .and_then(|html_element| html_element.directionality())
-        {
-            directionality
-        } else {
-            let node = self.upcast::<Node>();
-            node.parent_directionality()
-        }
+            .unwrap_or_else(|| {
+                let node = self.upcast::<Node>();
+                node.parent_directionality()
+            })
     }
 }
 

diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
@@ -438,21 +438,19 @@ impl Node {
 
         loop {
             match current {
-                Some(parent) => {
-                    if let Some(directionality) = parent
+                Some(node) => {
+                    if let Some(directionality) = node
                         .downcast::<HTMLElement>()
                         .and_then(|html_element| html_element.directionality())
                     {
                         return directionality;
                     } else {
-                        current = parent.GetParentNode();
+                        current = node.GetParentNode();
                     }
                 },
-                None => break,
+                None => return "ltr".to_owned(),
             }
         }
-
-        "ltr".to_owned()
     }
 }