From 7e2107b1a583eed1d7cbc87bf3f6a28874a08720 Mon Sep 17 00:00:00 2001 From: Dmitry Kolupaev Date: Sun, 16 Feb 2020 00:58:27 +0300 Subject: [PATCH] Simplify node#parent_directionality --- components/script/dom/htmlelement.rs | 5 ++++- components/script/dom/node.rs | 10 ++-------- .../{dirname-rtl.html => dirname-rtl-auto.html} | 0 3 files changed, 6 insertions(+), 9 deletions(-) rename tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/{dirname-rtl.html => dirname-rtl-auto.html} (100%) diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs index 81f3f823711..7c2181e2c96 100644 --- a/components/script/dom/htmlelement.rs +++ b/components/script/dom/htmlelement.rs @@ -788,7 +788,10 @@ impl HTMLElement { } if element_direction == "auto" { - if let Some(directionality) = self.downcast::().and_then(|input| input.auto_directionality()) { + if let Some(directionality) = self + .downcast::() + .and_then(|input| input.auto_directionality()) + { return directionality; } diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 1ecafaf3bf3..c9d423b382d 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -434,19 +434,13 @@ impl Node { } pub fn parent_directionality(&self) -> String { - println!("Node#parent_directionality"); match self.GetParentNode() { Some(parent) => { - if parent.is::() { - return "ltr".to_owned(); - } - - println!("Node#parent_directionality Some(Parent)"); - return if let Some(parent_html) = parent.downcast::() { + if let Some(parent_html) = parent.downcast::() { parent_html.directionality() } else { parent.parent_directionality() - }; + } }, None => "ltr".to_owned(), } diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl.html b/tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl.html rename to tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-auto.html