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
  * 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 "core/layout/LayoutObject.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;
+    unsigned sizeOfMembers() const;
+    void updatePosition() const;
 
     DECLARE_TRACE();
 
 private:
     RadioButtonGroup();
     void setNeedsValidityCheckForAllButtons();
     bool isValid() const;
     void setCheckedButton(HTMLInputElement*);
+    bool isNext(HTMLInputElement* list, HTMLInputElement* current) const;

[keishi, 2016/02/05 03:05:26]

nit: Could you make the method name more specific so its easier to tell that
this is comparing the layout position, not dom order.

[je_julie(Not used), 2016/02/13 03:19:00]

I updated it with isNextPosition().

 
     // 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;
+    bool m_needToUpdateIndex;
 };
 
 RadioButtonGroup::RadioButtonGroup()
     : m_checkedButton(nullptr)
     , m_requiredCount(0)
+    , m_needToUpdateIndex(false)
 {
 }
 
 PassOwnPtrWillBeRawPtr<RadioButtonGroup> RadioButtonGroup::create()
 {
     return adoptPtrWillBeNoop(new RadioButtonGroup);
 }
 
 inline bool RadioButtonGroup::isValid() const
 {
@@ skipping 23 matching lines @@
         m_requiredCount--;
     }
 }
 
 void RadioButtonGroup::add(HTMLInputElement* button)
 {
     ASSERT(button->type() == InputTypeNames::radio);
     auto addResult = m_members.add(button, false);
     if (!addResult.isNewEntry)
         return;
+
+    m_needToUpdateIndex = true;
     bool groupWasValid = isValid();
     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
@@ skipping 33 matching lines @@
     if (wasValid != isValid())
         setNeedsValidityCheckForAllButtons();
 }
 
 void RadioButtonGroup::remove(HTMLInputElement* button)
 {
     ASSERT(button->type() == InputTypeNames::radio);
     auto it = m_members.find(button);
     if (it == m_members.end())
         return;
+
+    m_needToUpdateIndex = true;
     bool wasValid = isValid();
     ASSERT(it->value == button->isRequired());
     updateRequiredButton(*it, false);
     m_members.remove(it);
     if (m_checkedButton == button)
         m_checkedButton = nullptr;
 
     if (m_members.isEmpty()) {
         ASSERT(!m_requiredCount);
         ASSERT(!m_checkedButton);
@@ skipping 14 matching lines @@
         ASSERT(button->type() == InputTypeNames::radio);
         button->setNeedsValidityCheck();
     }
 }
 
 bool RadioButtonGroup::contains(HTMLInputElement* button) const
 {
     return m_members.contains(button);
 }
 
+void RadioButtonGroup::updatePosition() const
+{
+    if (!m_needToUpdateIndex)

[keishi, 2016/02/05 03:05:26]

List order seems to rely on layout.
Does m_needToUpdateIndex need to be true whenever CSS updates the position of
the radio group?

[je_julie(Not used), 2016/02/13 03:19:00]

I also set this flag in LayoutBlockFlow::layoutBlock().

+        return;
+
+    WillBeHeapVector<RawPtrWillBeMember<HTMLInputElement>> orderd;
+    for (auto& element : m_members) {
+        HTMLInputElement* const current = element.key;
+        ASSERT(current->type() == InputTypeNames::radio);
+        if (orderd.isEmpty()) {
+            orderd.append(current);
+        } else {
+            unsigned position = 0;
+            for (auto& orderedList : orderd) {
+                if (!isNext(orderedList, current))
+                    break;
+                position++;
+            }
+            orderd.insert(position, current);
+        }
+    }
+
+    unsigned index = 0;
+    for (auto& orderedList : orderd) {
+        index++;
+        orderedList->setPositionInRadioGroup(index);
+    }
+}
+
+bool RadioButtonGroup::isNext(HTMLInputElement* list, HTMLInputElement* current) const
+{
+    if (!current->layoutObject() || !list->layoutObject())
+        return true;
+
+    IntRect listRect = list->layoutObject()->absoluteBoundingBoxRect();
+    IntRect currentRect = current->layoutObject()->absoluteBoundingBoxRect();
+    if (listRect.y() < currentRect.y())
+        return true;
+    if (listRect.y() == currentRect.y() && listRect.x() <= currentRect.x())

[keishi, 2016/02/05 03:05:26]

Just curious. Is this ok for rtl?

[je_julie(Not used), 2016/02/13 03:19:00]

Right. We have to consider RTL case as well. I updated it.

+        return true;
+    return false;
+}
+
+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::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::updateGroupPosition(HTMLInputElement* element) const
+{
+    if (!m_nameToGroupMap)
+        return;
+
+    RadioButtonGroup* group = m_nameToGroupMap->get(element->name());
+    if (!group)
+        return;
+    group->updatePosition();
+}
+
 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 blink