Precisely account for required buttons in a radio group.

third_party/WebKit/Source/core/html/forms/RadioButtonGroupScope.cpp

 /*
  * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * 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
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "core/html/forms/RadioButtonGroupScope.h"
 
 #include "core/InputTypeNames.h"
 #include "core/html/HTMLInputElement.h"
-#include "wtf/HashSet.h"
+#include "wtf/HashMap.h"
 
 namespace blink {
 
 class RadioButtonGroup : public NoBaseWillBeGarbageCollected<RadioButtonGroup> {
     USING_FAST_MALLOC_WILL_BE_REMOVED(RadioButtonGroup);
 public:
     static PassOwnPtrWillBeRawPtr<RadioButtonGroup> create();
     bool isEmpty() const { return m_members.isEmpty(); }
     bool isRequired() const { return m_requiredCount; }
     HTMLInputElement* checkedButton() const { return m_checkedButton; }
     void add(HTMLInputElement*);
     void updateCheckedState(HTMLInputElement*);
     void requiredAttributeChanged(HTMLInputElement*);
     void remove(HTMLInputElement*);
     bool contains(HTMLInputElement*) const;
 
     DECLARE_TRACE();
 
 private:
     RadioButtonGroup();
     void setNeedsValidityCheckForAllButtons();
     bool isValid() const;
     void setCheckedButton(HTMLInputElement*);
 
-    WillBeHeapHashSet<RawPtrWillBeMember<HTMLInputElement>> m_members;
+    // The map records the 'required' state of each (button) element.
+    using Members = WillBeHeapHashMap<RawPtrWillBeMember<HTMLInputElement>, bool>;
+
+#if ENABLE(OILPAN)
+    using MemberKeyValue = WTF::KeyValuePair<Member<HTMLInputElement>, bool>;
+#else
+    using MemberKeyValue = WTF::KeyValuePair<HTMLInputElement*, bool>;
+#endif
+
+    void updateRequiredButton(MemberKeyValue&, bool isRequired);
+
+    Members m_members;
     RawPtrWillBeMember<HTMLInputElement> m_checkedButton;
     size_t m_requiredCount;
 };
 
 RadioButtonGroup::RadioButtonGroup()
     : m_checkedButton(nullptr)
     , m_requiredCount(0)
 {
 }
 
@@ skipping 10 matching lines @@
 void RadioButtonGroup::setCheckedButton(HTMLInputElement* button)
 {
     HTMLInputElement* oldCheckedButton = m_checkedButton;
     if (oldCheckedButton == button)
         return;
     m_checkedButton = button;
     if (oldCheckedButton)
         oldCheckedButton->setChecked(false);
 }
 
+void RadioButtonGroup::updateRequiredButton(MemberKeyValue& it, bool isRequired)
+{
+    if (it.value == isRequired)
+        return;
+
+    it.value = isRequired;
+    if (isRequired) {
+        m_requiredCount++;
+    } else {
+        ASSERT(m_requiredCount);
+        m_requiredCount--;
+    }
+}
+
 void RadioButtonGroup::add(HTMLInputElement* button)
 {
     ASSERT(button->type() == InputTypeNames::radio);
-    if (!m_members.add(button).isNewEntry)
+    auto addResult = m_members.add(button, false);
+    if (!addResult.isNewEntry)
         return;
     bool groupWasValid = isValid();
-    if (button->isRequired())
-        ++m_requiredCount;
+    updateRequiredButton(*addResult.storedValue, button->isRequired());
     if (button->checked())
         setCheckedButton(button);
 
     bool groupIsValid = isValid();
     if (groupWasValid != groupIsValid) {
         setNeedsValidityCheckForAllButtons();
     } else if (!groupIsValid) {
         // A radio button not in a group is always valid. We need to make it
         // invalid only if the group is invalid.
         button->setNeedsValidityCheck();
     }
 }
 
 void RadioButtonGroup::updateCheckedState(HTMLInputElement* button)
 {
     ASSERT(button->type() == InputTypeNames::radio);
     ASSERT(m_members.contains(button));
     bool wasValid = isValid();
     if (button->checked()) {
         setCheckedButton(button);
     } else {
         if (m_checkedButton == button)
             m_checkedButton = nullptr;
     }
     if (wasValid != isValid())
         setNeedsValidityCheckForAllButtons();
-    for (HTMLInputElement* const inputElement : m_members) {
+    for (auto& member : m_members) {
+        HTMLInputElement* const inputElement = member.key;
         inputElement->pseudoStateChanged(CSSSelector::PseudoIndeterminate);
     }
 }
 
 void RadioButtonGroup::requiredAttributeChanged(HTMLInputElement* button)
 {
     ASSERT(button->type() == InputTypeNames::radio);
-    ASSERT(m_members.contains(button));
+    auto it = m_members.find(button);
+    ASSERT(it != m_members.end());
     bool wasValid = isValid();
-    if (button->isRequired()) {
-        ++m_requiredCount;
-    } else {
-        ASSERT(m_requiredCount);
-        --m_requiredCount;
-    }
+    // Synchronize the 'required' flag for the button, along with
+    // updating the overall count.
+    updateRequiredButton(*it, button->isRequired());
     if (wasValid != isValid())
         setNeedsValidityCheckForAllButtons();
 }
 
 void RadioButtonGroup::remove(HTMLInputElement* button)
 {
     ASSERT(button->type() == InputTypeNames::radio);
-    WillBeHeapHashSet<RawPtrWillBeMember<HTMLInputElement>>::iterator it = m_members.find(button);
+    auto it = m_members.find(button);
     if (it == m_members.end())
         return;
     bool wasValid = isValid();
+    ASSERT(it->value == button->isRequired());
+    updateRequiredButton(*it, false);
     m_members.remove(it);
-    if (button->isRequired()) {
-        ASSERT(m_requiredCount);
-        --m_requiredCount;
-    }
     if (m_checkedButton == button)
         m_checkedButton = nullptr;
 
     if (m_members.isEmpty()) {
         ASSERT(!m_requiredCount);
         ASSERT(!m_checkedButton);
     } else if (wasValid != isValid()) {
         setNeedsValidityCheckForAllButtons();
     }
     if (!wasValid) {
         // A radio button not in a group is always valid. We need to make it
         // valid only if the group was invalid.
         button->setNeedsValidityCheck();
     }
 }
 
 void RadioButtonGroup::setNeedsValidityCheckForAllButtons()
 {
-    for (HTMLInputElement* const button : m_members) {
+    for (auto& element : m_members) {
+        HTMLInputElement* const button = element.key;
         ASSERT(button->type() == InputTypeNames::radio);
         button->setNeedsValidityCheck();
     }
 }
 
 bool RadioButtonGroup::contains(HTMLInputElement* button) const
 {
     return m_members.contains(button);
 }
 
@@ skipping 99 matching lines @@
 }
 
 DEFINE_TRACE(RadioButtonGroupScope)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_nameToGroupMap);
 #endif
 }
 
 } // namespace