Fix bug where form/fieldset :valid/:invalid won't be recalculated upon control's willValidate change

Source/core/html/HTMLFormControlElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 245 matching lines @@
     return InsertionDone;
 }
 
 void HTMLFormControlElement::removedFrom(ContainerNode* insertionPoint)
 {
     fieldSetAncestorsSetNeedsValidityCheck(insertionPoint);
     hideVisibleValidationMessage();
     m_hasValidationMessage = false;
     m_ancestorDisabledState = AncestorDisabledStateUnknown;
     m_dataListAncestorState = Unknown;
+    setNeedsWillValidateCheck();
     HTMLElement::removedFrom(insertionPoint);
     FormAssociatedElement::removedFrom(insertionPoint);
 }
 
 void HTMLFormControlElement::willChangeForm()
 {
-    formOwnerSetNeedsValidityCheck();
     FormAssociatedElement::willChangeForm();
+    formOwnerSetNeedsValidityCheck(ElementRemoval, isValidElement());
 }
 
 void HTMLFormControlElement::didChangeForm()
 {
-    formOwnerSetNeedsValidityCheck();
     FormAssociatedElement::didChangeForm();
+    formOwnerSetNeedsValidityCheck(ElementAddition, isValidElement());
 }
 
-void HTMLFormControlElement::formOwnerSetNeedsValidityCheck()
+void HTMLFormControlElement::formOwnerSetNeedsValidityCheck(ValidityRecalcReason reason, bool isValid)
 {
     HTMLFormElement* form = formOwner();
     if (form)
-        form->setNeedsValidityCheck();
+        form->setNeedsValidityCheck(reason, isValid);
 }
 
 void HTMLFormControlElement::fieldSetAncestorsSetNeedsValidityCheck(Node* node)
 {
     if (!node)
         return;
     for (HTMLFieldSetElement* fieldSet = Traversal<HTMLFieldSetElement>::firstAncestorOrSelf(*node); fieldSet; fieldSet = Traversal<HTMLFieldSetElement>::firstAncestor(*fieldSet))
         fieldSet->setNeedsValidityCheck();
 }
 
@@ skipping 102 matching lines @@
             m_dataListAncestorState = InsideDataList;
         else
             m_dataListAncestorState = NotInsideDataList;
     }
     return m_dataListAncestorState == NotInsideDataList && !isDisabledOrReadOnly();
 }
 
 bool HTMLFormControlElement::willValidate() const
 {
     if (!m_willValidateInitialized || m_dataListAncestorState == Unknown) {
-        m_willValidateInitialized = true;
-        bool newWillValidate = recalcWillValidate();
-        if (m_willValidate != newWillValidate) {
-            m_willValidate = newWillValidate;
-            const_cast<HTMLFormControlElement*>(this)->setNeedsValidityCheck();
-        }
+        const_cast<HTMLFormControlElement*>(this)->setNeedsWillValidateCheck(true);
     } else {
         // If the following assertion fails, setNeedsWillValidateCheck() is not
         // called correctly when something which changes recalcWillValidate() result
         // is updated.
         ASSERT(m_willValidate == recalcWillValidate());
     }
     return m_willValidate;
 }
 
-void HTMLFormControlElement::setNeedsWillValidateCheck()
+void HTMLFormControlElement::setNeedsWillValidateCheck(bool hideValidationMessageIfNeeded)
 {
     // We need to recalculate willValidate immediately because willValidate change can causes style change.
     bool newWillValidate = recalcWillValidate();
     if (m_willValidateInitialized && m_willValidate == newWillValidate)
         return;
     m_willValidateInitialized = true;
     m_willValidate = newWillValidate;
     setNeedsValidityCheck();
-    setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::Validate));
-    if (!m_willValidate)
+    // No need to trigger style recalculation here because
+    // setNeedsValidityCheck() does it in the right away. This relies on
+    // the assumption that valid() is always true if willValidate() is false.
+
+    if (hideValidationMessageIfNeeded && !m_willValidate)
         hideVisibleValidationMessage();
 }
 
 void HTMLFormControlElement::findCustomValidationMessageTextDirection(const String& message, TextDirection &messageDir, String& subMessage, TextDirection &subMessageDir)
 {
     bool hasStrongDirection;
     subMessage = fastGetAttribute(titleAttr);
     messageDir = determineDirectionality(message, hasStrongDirection);
     if (!subMessage.isEmpty())
         subMessageDir = renderer()->style()->direction();
@@ skipping 105 matching lines @@
 {
     // If the following assertion fails, setNeedsValidityCheck() is not called
     // correctly when something which changes validity is updated.
     ASSERT(m_isValid == valid());
     return m_isValid;
 }
 
 void HTMLFormControlElement::setNeedsValidityCheck()
 {
     bool newIsValid = valid();
-    if (willValidate() && newIsValid != m_isValid) {
-        formOwnerSetNeedsValidityCheck();
+    bool changed = newIsValid != m_isValid;
+    m_isValid = newIsValid;
+    if (changed) {
+        formOwnerSetNeedsValidityCheck(ElementModification, newIsValid);
         fieldSetAncestorsSetNeedsValidityCheck(parentNode());
         // Update style for pseudo classes such as :valid :invalid.
         pseudoStateChanged(CSSSelector::PseudoValid);
         pseudoStateChanged(CSSSelector::PseudoInvalid);
     }
-    m_isValid = newIsValid;
 
     // Updates only if this control already has a validation message.
     if (isValidationMessageVisible()) {
         // Calls updateVisibleValidationMessage() even if m_isValid is not
         // changed because a validation message can be changed.
         updateVisibleValidationMessage();
     }
 }
 
 void HTMLFormControlElement::setCustomValidity(const String& error)
@@ skipping 38 matching lines @@
 
 void HTMLFormControlElement::setFocus(bool flag)
 {
     LabelableElement::setFocus(flag);
 
     if (!flag && wasChangedSinceLastFormControlChangeEvent())
         dispatchFormControlChangeEvent();
 }
 
 } // namespace blink