Commit 5555d7ab authored by Mason Freed's avatar Mason Freed Committed by Commit Bot

Fix valueMissing() for immutable text-mode inputs

Prior to this commit, valueMissing() incorrectly returned true for
text-mode inputs that were readonly or disabled. With this CL, this
situation is fixed.

Fixed: 1039149
Change-Id: I0f3d9b5c00e7c4e9e8fa0a9767119a2ab5d6b01f
Bug: 1039149
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2003637
Commit-Queue: Mason Freed <masonfreed@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Reviewed-by: default avatarKent Tamura <tkent@chromium.org>
Auto-Submit: Mason Freed <masonfreed@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732686}
parent 95ac37de
......@@ -200,7 +200,11 @@ bool BaseTemporalInputType::ShouldRespectListAttribute() {
}
bool BaseTemporalInputType::ValueMissing(const String& value) const {
return GetElement().IsRequired() && value.IsEmpty();
// For text-mode input elements (including dates), the value is missing only
// if it is mutable.
// https://html.spec.whatwg.org/multipage/input.html#the-required-attribute
return GetElement().IsRequired() && value.IsEmpty() &&
!GetElement().IsDisabledOrReadOnly();
}
bool BaseTemporalInputType::MayTriggerVirtualKeyboard() const {
......
......@@ -511,7 +511,10 @@ bool HTMLTextAreaElement::ValueMissing() const {
}
bool HTMLTextAreaElement::ValueMissing(const String* value) const {
return IsRequiredFormControl() && (value ? *value : this->value()).IsEmpty();
// For textarea elements, the value is missing only if it is mutable.
// https://html.spec.whatwg.org/multipage/form-elements.html#attr-textarea-required
return IsRequiredFormControl() && !IsDisabledOrReadOnly() &&
(value ? *value : this->value()).IsEmpty();
}
bool HTMLTextAreaElement::TooLong() const {
......
......@@ -134,7 +134,10 @@ bool TextFieldInputType::IsTextField() const {
}
bool TextFieldInputType::ValueMissing(const String& value) const {
return GetElement().IsRequired() && value.IsEmpty();
// For text-mode input elements, the value is missing only if it is mutable.
// https://html.spec.whatwg.org/multipage/input.html#the-required-attribute
return GetElement().IsRequired() && value.IsEmpty() &&
!GetElement().IsDisabledOrReadOnly();
}
bool TextFieldInputType::CanSetSuggestedValue() {
......
This is a testharness.js-based test.
PASS [INPUT in TEXT status] validity.valid must be false if validity.patternMismatch is true
FAIL [INPUT in TEXT status] validity.valid must be false if validity.valueMissing is true assert_true: The validity.valid should be true, when control is disabled. expected true got false
PASS [INPUT in SEARCH status] validity.valid must be false if validity.patternMismatch is true
FAIL [INPUT in SEARCH status] validity.valid must be false if validity.valueMissing is true assert_true: The validity.valid should be true, when control is disabled. expected true got false
PASS [INPUT in TEL status] validity.valid must be false if validity.patternMismatch is true
FAIL [INPUT in TEL status] validity.valid must be false if validity.valueMissing is true assert_true: The validity.valid should be true, when control is disabled. expected true got false
PASS [INPUT in PASSWORD status] validity.valid must be false if validity.patternMismatch is true
FAIL [INPUT in PASSWORD status] validity.valid must be false if validity.valueMissing is true assert_true: The validity.valid should be true, when control is disabled. expected true got false
PASS [INPUT in URL status] validity.valid must be false if validity.patternMismatch is true
PASS [INPUT in URL status] validity.valid must be false if validity.typeMismatch is true
FAIL [INPUT in URL status] validity.valid must be false if validity.valueMissing is true assert_true: The validity.valid should be true, when control is disabled. expected true got false
PASS [INPUT in EMAIL status] validity.valid must be false if validity.patternMismatch is true
PASS [INPUT in EMAIL status] validity.valid must be false if validity.typeMismatch is true
FAIL [INPUT in EMAIL status] validity.valid must be false if validity.valueMissing is true assert_true: The validity.valid should be true, when control is disabled. expected true got false
PASS [INPUT in DATETIME-LOCAL status] validity.valid must be false if validity.rangeOverflow is true
PASS [INPUT in DATETIME-LOCAL status] validity.valid must be false if validity.rangeUnderflow is true
PASS [INPUT in DATETIME-LOCAL status] validity.valid must be false if validity.stepMismatch is true
FAIL [INPUT in DATETIME-LOCAL status] validity.valid must be false if validity.valueMissing is true assert_true: The validity.valid should be true, when control is disabled. expected true got false
PASS [INPUT in DATE status] validity.valid must be false if validity.rangeOverflow is true
PASS [INPUT in DATE status] validity.valid must be false if validity.rangeUnderflow is true
PASS [INPUT in DATE status] validity.valid must be false if validity.stepMismatch is true
FAIL [INPUT in DATE status] validity.valid must be false if validity.valueMissing is true assert_true: The validity.valid should be true, when control is disabled. expected true got false
PASS [INPUT in MONTH status] validity.valid must be false if validity.rangeOverflow is true
PASS [INPUT in MONTH status] validity.valid must be false if validity.rangeUnderflow is true
PASS [INPUT in MONTH status] validity.valid must be false if validity.stepMismatch is true
FAIL [INPUT in MONTH status] validity.valid must be false if validity.valueMissing is true assert_true: The validity.valid should be true, when control is disabled. expected true got false
PASS [INPUT in WEEK status] validity.valid must be false if validity.rangeOverflow is true
PASS [INPUT in WEEK status] validity.valid must be false if validity.rangeUnderflow is true
PASS [INPUT in WEEK status] validity.valid must be false if validity.stepMismatch is true
FAIL [INPUT in WEEK status] validity.valid must be false if validity.valueMissing is true assert_true: The validity.valid should be true, when control is disabled. expected true got false
PASS [INPUT in TIME status] validity.valid must be false if validity.rangeOverflow is true
PASS [INPUT in TIME status] validity.valid must be false if validity.rangeUnderflow is true
PASS [INPUT in TIME status] validity.valid must be false if validity.stepMismatch is true
FAIL [INPUT in TIME status] validity.valid must be false if validity.valueMissing is true assert_true: The validity.valid should be true, when control is disabled. expected true got false
PASS [INPUT in NUMBER status] validity.valid must be false if validity.rangeOverflow is true
PASS [INPUT in NUMBER status] validity.valid must be false if validity.rangeUnderflow is true
PASS [INPUT in NUMBER status] validity.valid must be false if validity.stepMismatch is true
FAIL [INPUT in NUMBER status] validity.valid must be false if validity.valueMissing is true assert_true: The validity.valid should be true, when control is disabled. expected true got false
PASS [INPUT in CHECKBOX status] validity.valid must be false if validity.valueMissing is true
PASS [INPUT in RADIO status] validity.valid must be false if validity.valueMissing is true
PASS [INPUT in FILE status] validity.valid must be false if validity.valueMissing is true
PASS [select] validity.valid must be false if validity.valueMissing is true
FAIL [textarea] validity.valid must be false if validity.valueMissing is true assert_true: The validity.valid should be true, when control is disabled. expected true got false
Harness: the test ran to completion.
......@@ -23,6 +23,10 @@
tag: "input",
types: ["datetime-local"],
testData: [
// Note that several of these datetime strings use a ' ' separator, which
// is questionably spec-compliant. See:
// - crbug.com/521871
// - https://github.com/whatwg/html/issues/2276
{conditions: {required: false, value: ""}, expected: false, name: "[target] The required attribute is not set"},
{conditions: {required: true, value: "2000-12-10T12:00:00"}, expected: false, name: "[target] Valid local date and time string(2000-12-10T12:00:00)"},
{conditions: {required: true, value: "2000-12-10 12:00"}, expected: false, name: "[target] Valid local date and time string(2000-12-10 12:00)"},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment