Remove CheckValidityEventBehavior.

The behavior of ListedElement::checkValidity() with
kCheckValidityDispatchNoEvent was very simple. This CL introduces
IsNotCandidateOrValid() for that behavior, and removes
CheckValidityEventBehavior argument of checkValidity().

Change-Id: Ieff28ada30cc47d8617e73306d874cdfa9dee43c
Reviewed-on: https://chromium-review.googlesource.com/c/1364990
Commit-Queue: Kent Tamura <tkent@chromium.org>
Reviewed-by: Keishi Hattori <keishi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#614296}

third_party/blink/renderer/core/html/forms/html_field_set_element.cc

@@ -54,13 +54,11 @@ bool HTMLFieldSetElement::MatchesValidityPseudoClasses() const {
 bool HTMLFieldSetElement::IsValidElement() {
   for (Element* element : *elements()) {
     if (element->IsFormControlElement()) {
-      if (!ToHTMLFormControlElement(element)->checkValidity(
-              nullptr, kCheckValidityDispatchNoEvent))
+      if (!ToHTMLFormControlElement(element)->IsNotCandidateOrValid())
         return false;
     } else if (element->IsHTMLElement() &&
                ToHTMLElement(element)->IsFormAssociatedCustomElement()) {
-      if (!element->EnsureElementInternals().ListedElement::checkValidity(
-              nullptr, kCheckValidityDispatchNoEvent))
+      if (!element->EnsureElementInternals().IsNotCandidateOrValid())
         return false;
     }
   }

third_party/blink/renderer/core/html/forms/html_form_element.cc

@@ -101,8 +101,11 @@ bool HTMLFormElement::MatchesValidityPseudoClasses() const {
 }
 
 bool HTMLFormElement::IsValidElement() {
-  return !CheckInvalidControlsAndCollectUnhandled(
-      nullptr, kCheckValidityDispatchNoEvent);
+  for (const auto& element : ListedElements()) {
+    if (!element->IsNotCandidateOrValid())
+      return false;
+  }
+  return true;
 }
 
 Node::InsertionNotificationRequest HTMLFormElement::InsertedInto(
@@ -211,8 +214,7 @@ bool HTMLFormElement::ValidateInteractively() {
     element->HideVisibleValidationMessage();
 
   ListedElement::List unhandled_invalid_controls;
-  if (!CheckInvalidControlsAndCollectUnhandled(
-          &unhandled_invalid_controls, kCheckValidityDispatchInvalidEvent))
+  if (!CheckInvalidControlsAndCollectUnhandled(&unhandled_invalid_controls))
     return true;
   UseCounter::Count(GetDocument(),
                     WebFeature::kFormValidationAbortedSubmission);
@@ -718,15 +720,13 @@ HTMLFormControlElement* HTMLFormElement::FindDefaultButton() const {
 }
 
 bool HTMLFormElement::checkValidity() {
-  return !CheckInvalidControlsAndCollectUnhandled(
-      nullptr, kCheckValidityDispatchInvalidEvent);
+  return !CheckInvalidControlsAndCollectUnhandled(nullptr);
 }
 
 bool HTMLFormElement::CheckInvalidControlsAndCollectUnhandled(
-    ListedElement::List* unhandled_invalid_controls,
-    CheckValidityEventBehavior event_behavior) {
+    ListedElement::List* unhandled_invalid_controls) {
   // Copy listedElements because event handlers called from
-  // HTMLFormControlElement::checkValidity() might change listedElements.
+  // ListedElement::checkValidity() might change listed_elements.
   const ListedElement::List& listed_elements = ListedElements();
   HeapVector<Member<ListedElement>> elements;
   elements.ReserveCapacity(listed_elements.size());
@@ -745,12 +745,9 @@ bool HTMLFormElement::CheckInvalidControlsAndCollectUnhandled(
       should_check_validity = true;
     }
     if (should_check_validity &&
-        !element->checkValidity(unhandled_invalid_controls, event_behavior) &&
+        !element->checkValidity(unhandled_invalid_controls) &&
         element->Form() == this) {
       ++invalid_controls_count;
-      if (!unhandled_invalid_controls &&
-          event_behavior == kCheckValidityDispatchNoEvent)
-        return true;
     }
   }
   return invalid_controls_count;

third_party/blink/renderer/core/html/forms/html_form_element.h

@@ -144,8 +144,7 @@ class CORE_EXPORT HTMLFormElement final : public HTMLElement {
   // Validates each of the controls, and stores controls of which 'invalid'
   // event was not canceled to the specified vector. Returns true if there
   // are any invalid controls in this form.
-  bool CheckInvalidControlsAndCollectUnhandled(ListedElement::List*,
-                                               CheckValidityEventBehavior);
+  bool CheckInvalidControlsAndCollectUnhandled(ListedElement::List*);
 
   Element* ElementFromPastNamesMap(const AtomicString&);
   void AddToPastNamesMap(Element*, const AtomicString& past_name);

third_party/blink/renderer/core/html/forms/listed_element.cc

@@ -429,14 +429,9 @@ ValidationMessageClient* ListedElement::GetValidationMessageClient() const {
   return nullptr;
 }
 
-bool ListedElement::checkValidity(List* unhandled_invalid_controls,
-                                  CheckValidityEventBehavior event_behavior) {
-  if (!WillValidate())
+bool ListedElement::checkValidity(List* unhandled_invalid_controls) {
+  if (IsNotCandidateOrValid())
     return true;
-  if (IsValidElement())
-    return true;
-  if (event_behavior != kCheckValidityDispatchInvalidEvent)
-    return false;
   HTMLElement& element = ToHTMLElement(*this);
   Document* original_document = &element.GetDocument();
   DispatchEventResult dispatch_result = element.DispatchEvent(
@@ -457,8 +452,7 @@ void ListedElement::ShowValidationMessage() {
 
 bool ListedElement::reportValidity() {
   List unhandled_invalid_controls;
-  bool is_valid = checkValidity(&unhandled_invalid_controls,
-                                kCheckValidityDispatchInvalidEvent);
+  bool is_valid = checkValidity(&unhandled_invalid_controls);
   if (is_valid || unhandled_invalid_controls.IsEmpty())
     return is_valid;
   DCHECK_EQ(unhandled_invalid_controls.size(), 1u);
@@ -493,6 +487,12 @@ bool ListedElement::IsValidElement() {
   return is_valid_;
 }
 
+bool ListedElement::IsNotCandidateOrValid() {
+  // Apply Element::willValidate(), not ListedElement::WillValidate(), because
+  // some elements override willValidate().
+  return !ToHTMLElement(this)->willValidate() || IsValidElement();
+}
+
 void ListedElement::SetNeedsValidityCheck() {
   HTMLElement& element = ToHTMLElement(*this);
   if (!validity_is_dirty_) {

third_party/blink/renderer/core/html/forms/listed_element.h

@@ -42,11 +42,6 @@ class Node;
 class ValidationMessageClient;
 class ValidityState;
 
-enum CheckValidityEventBehavior {
-  kCheckValidityDispatchNoEvent,
-  kCheckValidityDispatchInvalidEvent
-};
-
 // https://html.spec.whatwg.org/multipage/forms.html#category-listed
 class CORE_EXPORT ListedElement : public GarbageCollectedMixin {
  public:
@@ -103,9 +98,7 @@ class CORE_EXPORT ListedElement : public GarbageCollectedMixin {
   virtual void setCustomValidity(const String&);
   void UpdateVisibleValidationMessage();
   void HideVisibleValidationMessage();
-  bool checkValidity(
-      List* unhandled_invalid_controls = nullptr,
-      CheckValidityEventBehavior = kCheckValidityDispatchInvalidEvent);
+  bool checkValidity(List* unhandled_invalid_controls = nullptr);
   bool reportValidity();
   // This must be called only after the caller check the element is focusable.
   void ShowValidationMessage();
@@ -117,6 +110,12 @@ class CORE_EXPORT ListedElement : public GarbageCollectedMixin {
 
   // For Element::IsValidElement(), which is for :valid :invalid selectors.
   bool IsValidElement();
+  // Returns true if
+  //  - this is not a candidate for constraint validation, or
+  //    https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#candidate-for-constraint-validation
+  //  - this satisfies its constraints
+  //    https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#concept-fv-valid
+  bool IsNotCandidateOrValid();
 
   // This must be called when a validation constraint or control value is
   // changed.

third_party/blink/renderer/core/html/html_element.cc

@@ -1516,6 +1516,12 @@ bool HTMLElement::MatchesValidityPseudoClasses() const {
   return IsFormAssociatedCustomElement();
 }
 
+bool HTMLElement::willValidate() const {
+  return IsFormAssociatedCustomElement() && const_cast<HTMLElement*>(this)
+                                                ->EnsureElementInternals()
+                                                .WillValidate();
+}
+
 bool HTMLElement::IsValidElement() {
   return IsFormAssociatedCustomElement() &&
          EnsureElementInternals().IsValidElement();

third_party/blink/renderer/core/html/html_element.h

@@ -127,6 +127,7 @@ class CORE_EXPORT HTMLElement : public Element {
   bool MatchesReadOnlyPseudoClass() const override;
   bool MatchesReadWritePseudoClass() const override;
   bool MatchesValidityPseudoClasses() const override;
+  bool willValidate() const override;
   bool IsValidElement() override;
 
   static const AtomicString& EventParameterName();

third_party/blink/renderer/modules/accessibility/ax_node_object.cc

@@ -1422,11 +1422,8 @@ ax::mojom::InvalidState AXNodeObject::GetInvalidState() const {
   if (GetNode() && GetNode()->IsElementNode() &&
       ToElement(GetNode())->IsFormControlElement()) {
     HTMLFormControlElement* element = ToHTMLFormControlElement(GetNode());
-    ListedElement::List invalid_controls;
-    bool is_invalid = !element->checkValidity(&invalid_controls,
-                                              kCheckValidityDispatchNoEvent);
-    return is_invalid ? ax::mojom::InvalidState::kTrue
-                      : ax::mojom::InvalidState::kFalse;
+    return element->IsNotCandidateOrValid() ? ax::mojom::InvalidState::kFalse
+                                            : ax::mojom::InvalidState::kTrue;
   }
 
   return AXObject::GetInvalidState();