diff options
author | Jon Leighton <j@jonathanleighton.com> | 2017-12-03 19:09:34 +0100 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2017-12-06 21:11:39 +0100 |
commit | 05bfb8d07aec90a232d12e503dc611d3dbd4bc0a (patch) | |
tree | 579af7a14aa3b8b5dcb9bf518289a80bd65924f9 /components/script/dom/htmlelement.rs | |
parent | 005fd9cfa864a22473d0cdb980a11b874bcd1b03 (diff) | |
download | servo-05bfb8d07aec90a232d12e503dc611d3dbd4bc0a.tar.gz servo-05bfb8d07aec90a232d12e503dc611d3dbd4bc0a.zip |
Expand InputType to cover all possible types
This came out of a conversation with nox in IRC:
https://mozilla.logbot.info/servo/20171201#c13946454-c13946594
The code I was working on which motivated this change is here:
https://github.com/servo/servo/pull/19461
Previously, InputType::Text was used to represent several different
values of the type attribute on an input element.
If an input element doesn't have a type attribute, or its type attribute
doesn't contain a recognised value, then the input's type defaults to
"text".
Before this change, there were a number of checks in the code which
directly looked at the type attribute. If those checks matched against
the value "text", then they were potentially buggy, since an input with
type=invalid should also behave like an input with type=text.
Rather than have every conditional which cares about the input type also
have to deal with invalid input types, we can convert the type attribute
to an InputType enum once, and then match against the enum.
A secondary benefit is that the compiler can tell us whether we've
missed branches in a match expression. While working on this I
discovered that the HTMLInputElement::value_mode() method misses a case
for inputs with type=hidden (this resulted in a failing WPT test
passing).
I've also implemented the Default trait for InputType, so we now only
have one place in the code which knows that InputType::Text is the
default, where previously there were several.
Diffstat (limited to 'components/script/dom/htmlelement.rs')
-rw-r--r-- | components/script/dom/htmlelement.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs index cb423ca37a3..89b0c0d9de2 100644 --- a/components/script/dom/htmlelement.rs +++ b/components/script/dom/htmlelement.rs @@ -22,7 +22,7 @@ use dom::eventtarget::EventTarget; use dom::htmlbodyelement::HTMLBodyElement; use dom::htmlframesetelement::HTMLFrameSetElement; use dom::htmlhtmlelement::HTMLHtmlElement; -use dom::htmlinputelement::HTMLInputElement; +use dom::htmlinputelement::{HTMLInputElement, InputType}; use dom::htmllabelelement::HTMLLabelElement; use dom::node::{Node, NodeFlags}; use dom::node::{document_from_node, window_from_node}; @@ -497,7 +497,7 @@ impl HTMLElement { NodeTypeId::Element(ElementTypeId::HTMLElement(type_id)) => match type_id { HTMLElementTypeId::HTMLInputElement => - self.downcast::<HTMLInputElement>().unwrap().type_() != atom!("hidden"), + self.downcast::<HTMLInputElement>().unwrap().input_type() != InputType::Hidden, HTMLElementTypeId::HTMLButtonElement | HTMLElementTypeId::HTMLMeterElement | HTMLElementTypeId::HTMLOutputElement | |