From 6f0cba0855f05850d4071cb92c323350f1eaa751 Mon Sep 17 00:00:00 2001 From: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com> Date: Tue, 26 Sep 2023 02:05:37 -0300 Subject: [PATCH] Refactor the `translatable` attribute lightly (#30430) --- components/script/dom/element.rs | 7 +++---- components/script/dom/htmlelement.rs | 3 +-- .../translate-enumerated-ascii-case-insensitive.html.ini | 4 ---- .../translate-enumerated-ascii-case-insensitive.html.ini | 3 --- 4 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 tests/wpt/meta-legacy-layout/html/dom/elements/global-attributes/translate-enumerated-ascii-case-insensitive.html.ini delete mode 100644 tests/wpt/meta/html/dom/elements/global-attributes/translate-enumerated-ascii-case-insensitive.html.ini diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index f204b95f3b4..f166dc8cebf 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -558,10 +558,9 @@ impl Element { // https://html.spec.whatwg.org/multipage/#translation-mode pub fn is_translate_enabled(&self) -> bool { - // TODO change this to local_name! when html5ever updates - let name = &LocalName::from("translate"); + let name = &html5ever::local_name!("translate"); if self.has_attribute(name) { - match &*self.get_string_attribute(name) { + match_ignore_ascii_case! { &*self.get_string_attribute(name), "yes" | "" => return true, "no" => return false, _ => {}, @@ -572,7 +571,7 @@ impl Element { return elem.is_translate_enabled(); } } - true // whatwg/html#5239 + true } // https://html.spec.whatwg.org/multipage/#the-directionality diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs index 03560848965..01ba77278cd 100644 --- a/components/script/dom/htmlelement.rs +++ b/components/script/dom/htmlelement.rs @@ -516,8 +516,7 @@ impl HTMLElementMethods for HTMLElement { // https://html.spec.whatwg.org/multipage/#dom-translate fn SetTranslate(&self, yesno: bool) { self.upcast::().set_string_attribute( - // TODO change this to local_name! when html5ever updates - &LocalName::from("translate"), + &html5ever::local_name!("translate"), match yesno { true => DOMString::from("yes"), false => DOMString::from("no"), diff --git a/tests/wpt/meta-legacy-layout/html/dom/elements/global-attributes/translate-enumerated-ascii-case-insensitive.html.ini b/tests/wpt/meta-legacy-layout/html/dom/elements/global-attributes/translate-enumerated-ascii-case-insensitive.html.ini deleted file mode 100644 index d66d6e926d3..00000000000 --- a/tests/wpt/meta-legacy-layout/html/dom/elements/global-attributes/translate-enumerated-ascii-case-insensitive.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[translate-enumerated-ascii-case-insensitive.html] - [keyword yes] - expected: FAIL - diff --git a/tests/wpt/meta/html/dom/elements/global-attributes/translate-enumerated-ascii-case-insensitive.html.ini b/tests/wpt/meta/html/dom/elements/global-attributes/translate-enumerated-ascii-case-insensitive.html.ini deleted file mode 100644 index 699a8a1a043..00000000000 --- a/tests/wpt/meta/html/dom/elements/global-attributes/translate-enumerated-ascii-case-insensitive.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[translate-enumerated-ascii-case-insensitive.html] - [keyword yes] - expected: FAIL