posinset and setsize for input type, radio, exposed in AX tree

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
@@ skipping 20 matching lines @@
 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;
+    unsigned posInMembers(HTMLInputElement*) const;

[keishi, 2016/01/26 01:32:23]

nit: Blink style avoid abbreviations so positionInMembers might be better.

[je_julie(Not used), 2016/02/02 00:36:17]

Done

+    unsigned sizeOfMembers() const;
 
     DECLARE_TRACE();
 
 private:
     RadioButtonGroup();
     void setNeedsValidityCheckForAllButtons();
     bool isValid() const;
     void setCheckedButton(HTMLInputElement*);
 
-    WillBeHeapHashSet<RawPtrWillBeMember<HTMLInputElement>> m_members;
+    WillBeHeapVector<RawPtrWillBeMember<HTMLInputElement>> m_members;

[keishi, 2016/01/26 01:32:23]

This change will conflict with https://codereview.chromium.org/1632493002/

[je_julie(Not used), 2016/02/02 00:36:17]

I rebased code on that CL.

     RawPtrWillBeMember<HTMLInputElement> m_checkedButton;
     size_t m_requiredCount;
 };
 
 RadioButtonGroup::RadioButtonGroup()
     : m_checkedButton(nullptr)
     , m_requiredCount(0)
 {
 }
 
@@ skipping 13 matching lines @@
     if (oldCheckedButton == button)
         return;
     m_checkedButton = button;
     if (oldCheckedButton)
         oldCheckedButton->setChecked(false);
 }
 
 void RadioButtonGroup::add(HTMLInputElement* button)
 {
     ASSERT(button->type() == InputTypeNames::radio);
-    if (!m_members.add(button).isNewEntry)
+    if (m_members.contains(button))
         return;
+    m_members.append(button);
     bool groupWasValid = isValid();
     if (button->isRequired())
         ++m_requiredCount;
     if (button->checked())
         setCheckedButton(button);
 
     bool groupIsValid = isValid();
     if (groupWasValid != groupIsValid) {
         setNeedsValidityCheckForAllButtons();
     } else if (!groupIsValid) {
@@ skipping 32 matching lines @@
         ASSERT(m_requiredCount);
         --m_requiredCount;
     }
     if (wasValid != isValid())
         setNeedsValidityCheckForAllButtons();
 }
 
 void RadioButtonGroup::remove(HTMLInputElement* button)
 {
     ASSERT(button->type() == InputTypeNames::radio);
-    WillBeHeapHashSet<RawPtrWillBeMember<HTMLInputElement>>::iterator it = m_members.find(button);
-    if (it == m_members.end())
+    size_t idx = m_members.find(button);
+    if (idx == kNotFound)
         return;
     bool wasValid = isValid();
-    m_members.remove(it);
+    m_members.remove(idx);
     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);
@@ skipping 13 matching lines @@
         ASSERT(button->type() == InputTypeNames::radio);
         button->setNeedsValidityCheck();
     }
 }
 
 bool RadioButtonGroup::contains(HTMLInputElement* button) const
 {
     return m_members.contains(button);
 }
 
+unsigned RadioButtonGroup::posInMembers(HTMLInputElement* element) const
+{
+    unsigned index = 0;
+    for (HTMLInputElement* const button : m_members) {
+        index++;
+        if (button == element)
+            return index;
+    }
+    return 0;
+}
+
+unsigned RadioButtonGroup::sizeOfMembers() const
+{
+    return m_members.size();
+}
+
 DEFINE_TRACE(RadioButtonGroup)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_members);
     visitor->trace(m_checkedButton);
 #endif
 }
 
 // ----------------------------------------------------------------
 
@@ skipping 61 matching lines @@
 {
     ASSERT(element->type() == InputTypeNames::radio);
     if (element->name().isEmpty())
         return false;
     if (!m_nameToGroupMap)
         return false;
     RadioButtonGroup* group = m_nameToGroupMap->get(element->name());
     return group && group->isRequired() && group->contains(element);
 }
 
+unsigned RadioButtonGroupScope::posInGroup(HTMLInputElement* element) const
+{
+    if (!m_nameToGroupMap)
+        return 0;
+
+    RadioButtonGroup* group = m_nameToGroupMap->get(element->name());
+    if (!group)
+        return 0;
+
+    return group->posInMembers(element);
+}
+
+unsigned RadioButtonGroupScope::sizeOfGroup(HTMLInputElement* element) const
+{
+    if (!m_nameToGroupMap)
+        return 0;
+
+    RadioButtonGroup* group = m_nameToGroupMap->get(element->name());
+    if (!group)
+        return 0;
+    return group->sizeOfMembers();
+}
+
 void RadioButtonGroupScope::removeButton(HTMLInputElement* element)
 {
     ASSERT(element->type() == InputTypeNames::radio);
     if (element->name().isEmpty())
         return;
     if (!m_nameToGroupMap)
         return;
 
     RadioButtonGroup* group = m_nameToGroupMap->get(element->name());
     if (!group)
         return;
     group->remove(element);
     if (group->isEmpty()) {
         // We don't remove an empty RadioButtonGroup from m_nameToGroupMap for
         // better performance.
         ASSERT(!group->isRequired());
         ASSERT_WITH_SECURITY_IMPLICATION(!group->checkedButton());
     }
 }
 
 DEFINE_TRACE(RadioButtonGroupScope)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_nameToGroupMap);
 #endif
 }
 
 } // namespace