Expand InputType to cover all possible types #19471

jonleighton · 2017-12-03T20:07:47Z

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:
#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.

This change is

highfive · 2017-12-03T20:07:51Z

Heads up! This PR modifies the following files:

@asajeffrey: components/script/dom/htmlformelement.rs, components/script/dom/htmlinputelement.rs, components/script/dom/htmlelement.rs, components/script/dom/radionodelist.rs
@fitzgen: components/script/dom/htmlformelement.rs, components/script/dom/htmlinputelement.rs, components/script/dom/htmlelement.rs, components/script/dom/radionodelist.rs
@KiChjang: components/script/dom/htmlformelement.rs, components/script/dom/htmlinputelement.rs, components/script/dom/htmlelement.rs, components/script/dom/radionodelist.rs

jonleighton · 2017-12-03T20:09:39Z

r? @nox

jonleighton · 2017-12-03T20:10:44Z

components/script/dom/htmlinputelement.rs

-    InputCheckbox,
-    InputRadio,
-    InputPassword
+pub enum InputType {


I took the liberty of removing the Input prefix from the enum members, as this seemed redundant. Let me know if that's not OK.

jonleighton · 2017-12-03T20:12:32Z

components/script/dom/htmlinputelement.rs

+            &atom!("time") => InputType::Time,
+            &atom!("url") => InputType::Url,
+            &atom!("week") => InputType::Week,
+            v if *v == Atom::from("range") => InputType::Range,


I couldn't get it to compile without this hack. The compiler said that "range" didn't match the atom! macro. I'm not sure what the right thing to do here is, but I suspect this isn't it! Please let me know.

You'll need to add the "range" string to this file in order for the atom! macro to work with it.

Thanks. Seems like the way atoms work could really use some documentation, I've had a lot of questions about this area of the code.

jonleighton · 2017-12-03T20:13:31Z

components/script/dom/htmlinputelement.rs

+    Checkbox,
+    Color,
+    Date,
+    Datetime,


Do we really need this? datetime is an obsolete value and is not in the spec. It's also unsupported in Firefox. Doesn't seem like it needs to exist in Servo?

Agreed. We can file a followup issue.

KiChjang · 2017-12-04T02:53:02Z

components/script/dom/htmlinputelement.rs

        }
    }
+
+    pub fn input_type(&self) -> InputType {


I don't actually feel like this is THAT much of an improvement, since this essentially only saves us from typing .get. In fact, I think this may even hurt performance since we have to go through another function call... but since you've already made the change everywhere to use input_type(), the least we can do to mitigate this is to add a #[inline] annotation above.

Thanks, done. Note that there need to be some public way to get the InputType from outside of the crate, which is part of the reason that I added this function (the other part of the reason is indeed that I think it's slightly nicer to not have to repeat input_type.get() everywhere.

bors-servo · 2017-12-05T03:03:12Z

☔ The latest upstream changes (presumably #19385) made this pull request unmergeable. Please resolve the merge conflicts.

jdm · 2017-12-06T18:15:33Z

components/script/dom/htmlinputelement.rs

+    Checkbox,
+    Color,
+    Date,
+    Datetime,


Agreed. We can file a followup issue.

jdm · 2017-12-06T18:15:46Z

@bors-servo: r+
This is a great improvement! Thanks!

bors-servo · 2017-12-06T18:15:46Z

📌 Commit 9f7801d has been approved by jdm

bors-servo · 2017-12-06T18:15:51Z

⌛ Testing commit 9f7801d with merge 44a1e98...


        Auto merge of #19471 - jonleighton:input-type, r=jdm

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: #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.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19471)

bors-servo · 2017-12-06T18:54:55Z

💔 Test failed - linux-rel-wpt

jonleighton · 2017-12-06T19:08:31Z

I'll take a look at those failures


        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: #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.

jonleighton · 2017-12-06T20:13:10Z

Fixed. I needed to make InputType::from case-insensitive, so that <input type=password> matches the same as <input type=PASSWORD>.

jdm · 2017-12-06T20:16:00Z

@bors-servo r+

bors-servo · 2017-12-06T20:16:01Z

📌 Commit 05bfb8d has been approved by jdm

bors-servo · 2017-12-06T20:16:05Z

⌛ Testing commit 05bfb8d with merge 6a6da9c...


        Auto merge of #19471 - jonleighton:input-type, r=jdm

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: #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.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19471)

bors-servo · 2017-12-06T21:19:17Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: jdm
Pushing 6a6da9c to master...


        Remove support for <input type=datetime>

It has been removed from the spec: whatwg/html#336 See also servo#19471 (review)


        Auto merge of #19509 - jonleighton:remove-input-type-datetime, r=jdm

Remove support for <input type=datetime> It has been removed from the spec: whatwg/html#336 See also #19471 (review) ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable).  - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____    --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19509)


        servo: Merge #19509 - Remove support for <input type=datetime> (from …

…jonleighton:remove-input-type-datetime); r=jdm It has been removed from the spec: whatwg/html#336 See also servo/servo#19471 (review) ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable).  - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____   Source-Repo: https://github.com/servo/servo Source-Revision: 8e3056d0cc7caebc218d51373b3aa0ccd331fa20 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 76bd32c1d97be56bee2675857fcb5b20f2ed2d42


        servo: Merge #19509 - Remove support for <input type=datetime> (from …

…jonleighton:remove-input-type-datetime); r=jdm It has been removed from the spec: whatwg/html#336 See also servo/servo#19471 (review) ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable).  - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____   Source-Repo: https://github.com/servo/servo Source-Revision: 8e3056d0cc7caebc218d51373b3aa0ccd331fa20


        servo: Merge #19509 - Remove support for <input type=datetime> (from …

…jonleighton:remove-input-type-datetime); r=jdm It has been removed from the spec: whatwg/html#336 See also servo/servo#19471 (review) ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable).  - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____   Source-Repo: https://github.com/servo/servo Source-Revision: 8e3056d0cc7caebc218d51373b3aa0ccd331fa20

highfive assigned mbrubeck Dec 3, 2017

highfive added the S-awaiting-review label Dec 3, 2017

highfive assigned nox and unassigned mbrubeck Dec 3, 2017

jonleighton reviewed Dec 3, 2017

View changes

jonleighton mentioned this pull request Dec 3, 2017

Handle cases where selection API doesn't apply #19461

Merged

KiChjang reviewed Dec 4, 2017

View changes

jonleighton force-pushed the jonleighton:input-type branch 2 times, most recently from c3f9e0b to dded910 Dec 4, 2017

highfive added the S-needs-rebase label Dec 5, 2017

jonleighton force-pushed the jonleighton:input-type branch 2 times, most recently from 903033d to 9f7801d Dec 5, 2017

jdm assigned jdm and unassigned nox Dec 6, 2017

jdm approved these changes Dec 6, 2017

View changes

components/script/dom/htmlinputelement.rs

Checkbox,

Color,

Date,

Datetime,

This comment has been minimized.

Sign in to view

Copy link

jdm Dec 6, 2017
Member

Agreed. We can file a followup issue.

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-rebase labels Dec 6, 2017

highfive added S-tests-failed and removed S-awaiting-merge labels Dec 6, 2017

jonleighton force-pushed the jonleighton:input-type branch from 9f7801d to 05bfb8d Dec 6, 2017

highfive added S-awaiting-review and removed S-tests-failed labels Dec 6, 2017

highfive added S-awaiting-merge and removed S-awaiting-review labels Dec 6, 2017

bors-servo merged commit 05bfb8d into servo:master Dec 6, 2017
2 of 3 checks passed

2 of 3 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Dec 6, 2017

jonleighton added a commit to jonleighton/servo that referenced this pull request Dec 7, 2017

Remove support for <input type=datetime>

5ff4dc0

It has been removed from the spec: whatwg/html#336 See also servo#19471 (review)

jonleighton mentioned this pull request Dec 7, 2017

Remove support for <input type=datetime> #19509

Merged

3 of 5 tasks complete

servo / servo

Expand InputType to cover all possible types #19471

Expand InputType to cover all possible types #19471

jonleighton commented Dec 3, 2017 •

edited by SimonSapin

highfive commented Dec 3, 2017

jonleighton commented Dec 3, 2017

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors-servo commented Dec 5, 2017

This comment has been minimized.

jdm commented Dec 6, 2017

bors-servo commented Dec 6, 2017

bors-servo commented Dec 6, 2017

bors-servo commented Dec 6, 2017

jonleighton commented Dec 6, 2017

jonleighton commented Dec 6, 2017

jdm commented Dec 6, 2017

bors-servo commented Dec 6, 2017

bors-servo commented Dec 6, 2017

bors-servo commented Dec 6, 2017

servo / servo

Join GitHub today

Expand InputType to cover all possible types #19471

Expand InputType to cover all possible types #19471

Conversation

jonleighton commented Dec 3, 2017 • edited by SimonSapin

highfive commented Dec 3, 2017

jonleighton commented Dec 3, 2017

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors-servo commented Dec 5, 2017

This comment has been minimized.

jdm commented Dec 6, 2017

bors-servo commented Dec 6, 2017

bors-servo commented Dec 6, 2017

bors-servo commented Dec 6, 2017

jonleighton commented Dec 6, 2017

jonleighton commented Dec 6, 2017

jdm commented Dec 6, 2017

bors-servo commented Dec 6, 2017

bors-servo commented Dec 6, 2017

bors-servo commented Dec 6, 2017

jonleighton commented Dec 3, 2017 •

edited by SimonSapin