Changeset 284687 in webkit

Timestamp:

Oct 22, 2021, 9:23:23 AM (5 years ago)

Author:

Ayumi Kojima

Message:

Unreviewed, reverting r284606.

Reverting because this commit caused accessibility/ios-
simulator/accessibility-aria-table-children.html to fail

Reverted changeset:

"AX: Any addition of children should funnel through
AccessibilityObject::addChild"
​https://bugs.webkit.org/show_bug.cgi?id=231914
​https://commits.webkit.org/r284606

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityARIAGrid.cpp (modified) (2 diffs)
• accessibility/AccessibilityListBox.cpp (modified) (1 diff)
• accessibility/AccessibilityMenuList.cpp (modified) (1 diff)
• accessibility/AccessibilityMenuListPopup.cpp (modified) (1 diff)
• accessibility/AccessibilityObject.cpp (modified) (2 diffs)
• accessibility/AccessibilityRenderObject.cpp (modified) (3 diffs)
• accessibility/AccessibilityScrollView.cpp (modified) (1 diff)
• accessibility/AccessibilitySlider.cpp (modified) (1 diff)
• accessibility/AccessibilitySpinButton.cpp (modified) (1 diff)
• accessibility/AccessibilityTable.cpp (modified) (3 diffs)
• accessibility/AccessibilityTableColumn.cpp (modified) (1 diff)
• accessibility/AccessibilityTableHeaderContainer.cpp (modified) (1 diff)
• accessibility/AccessibilityTableRow.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-22  Ayumi Kojima  <ayumi_kojima@apple.com>
+
+        Unreviewed, reverting r284606.
+
+        Reverting because this commit caused accessibility/ios-
+        simulator/accessibility-aria-table-children.html to fail
+
+        Reverted changeset:
+
+        "AX: Any addition of children should funnel through
+        AccessibilityObject::addChild"
+        https://bugs.webkit.org/show_bug.cgi?id=231914
+        https://commits.webkit.org/r284606
+
 2021-10-22  Ayumi Kojima  <ayumi_kojima@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityARIAGrid.cpp

@@ -68 +68 @@
     row.setRowIndex((int)m_rows.size());
     m_rows.append(&row);
-    addChild(&row);
+
+    // Try adding the row if it's not ignoring accessibility,
+    // otherwise add its children (the cells) as the grid's children.
+    if (!row.accessibilityIsIgnored())
+        m_children.append(&row);
+    else
+        m_children.appendVector(row.children());
+
     appendedRows.add(&row);
     return true;
@@ -136 +143 @@
         column.setParent(this);
         m_columns.append(&column);
-        addChild(&column);
+        if (!column.accessibilityIsIgnored())
+            m_children.append(&column);
     }
 
-    addChild(headerContainer());
+    auto* headerContainerObject = headerContainer();
+    if (headerContainerObject && !headerContainerObject->accessibilityIsIgnored())
+        m_children.append(headerContainerObject);
 }
     

trunk/Source/WebCore/accessibility/AccessibilityListBox.cpp

@@ -74 +74 @@
     m_haveChildren = true;
 
-    for (const auto& listItem : downcast<HTMLSelectElement>(*selectNode).listItems())
-        addChild(listBoxOptionAccessibilityObject(listItem));
+    for (const auto& listItem : downcast<HTMLSelectElement>(*selectNode).listItems()) {
+        AccessibilityObject* listOption = listBoxOptionAccessibilityObject(listItem);
+        if (listOption && !listOption->accessibilityIsIgnored())
+            m_children.append(listOption);
+    }
 }
 

trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp

@@ -83 +83 @@
 
     m_haveChildren = true;
-    addChild(list);
+    m_children.append(list);
+
     list->addChildren();
 }

trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.cpp

@@ -97 +97 @@
     m_haveChildren = true;
 
-    for (const auto& listItem : downcast<HTMLSelectElement>(*selectNode).listItems())
-        addChild(menuListOptionAccessibilityObject(listItem));
+    for (const auto& listItem : downcast<HTMLSelectElement>(*selectNode).listItems()) {
+        // FIXME: Why does AccessibilityListBox::addChildren check accessibilityIsIgnored but this does not?
+        if (auto option = menuListOptionAccessibilityObject(listItem))
+            m_children.append(option);
+    }
 }
 

trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -484 +484 @@
         results.append(object);
 }
-
-#ifndef NDEBUG
-static bool isTableComponent(AXCoreObject& axObject)
-{
-    return axObject.isTable() || axObject.isTableColumn() || axObject.isTableRow() || axObject.isTableCell();
-}
-#endif
-
+    
 void AccessibilityObject::insertChild(AXCoreObject* child, unsigned index)
 {
@@ -524 +517 @@
             m_children.insert(index + i, children[i]);
     } else {
-        // Table component child-parent relationships often don't line up properly, hence the need for methods
-        // like parentTable() and parentRow(). Exclude them from this ASSERT.
-        ASSERT((!isTableComponent(*child) && !isTableComponent(*this)) ? child->parentObject() == this : true);
+        ASSERT(child->parentObject() == this);
         m_children.insert(index, child);
     }

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -3284 +3284 @@
         areaObject.setParent(this);
         if (!areaObject.accessibilityIsIgnored())
-            addChild(&areaObject);
+            m_children.append(&areaObject);
         else
             axObjectCache()->remove(areaObject.objectID());
@@ -3311 +3311 @@
     axSpinButton.setSpinButtonElement(downcast<SpinButtonElement>(spinButtonElement));
     axSpinButton.setParent(this);
-    addChild(&axSpinButton);
+    m_children.append(&axSpinButton);
 }
     
@@ -3375 +3375 @@
     // the parent must be set, because there's no other way to get back to who created the image.
     root->setParent(this);
-    addChild(root);
+    
+    if (root->accessibilityIsIgnored()) {
+        for (const auto& child : root->children())
+            m_children.append(child);
+    } else
+        m_children.append(root);
 }
 

trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp

@@ -164 +164 @@
     auto& scrollBarObject = downcast<AccessibilityScrollbar>(*cache->getOrCreate(scrollbar));
     scrollBarObject.setParent(this);
-    addChild(&scrollBarObject);
+    m_children.append(&scrollBarObject);
     return &scrollBarObject;
 }

trunk/Source/WebCore/accessibility/AccessibilitySlider.cpp

@@ -101 +101 @@
         cache->remove(thumb.objectID());
     else
-        addChild(&thumb);
+        m_children.append(&thumb);
 }
 

trunk/Source/WebCore/accessibility/AccessibilitySpinButton.cpp

@@ -92 +92 @@
     incrementor.setIsIncrementor(true);
     incrementor.setParent(this);
-    addChild(&incrementor);
+    m_children.append(&incrementor);
 
     auto& decrementor = downcast<AccessibilitySpinButtonPart>(*cache->create(AccessibilityRole::SpinButtonPart));
     decrementor.setIsIncrementor(false);
     decrementor.setParent(this);
-    addChild(&decrementor);
+    m_children.append(&decrementor);
 }
     

trunk/Source/WebCore/accessibility/AccessibilityTable.cpp

@@ -395 +395 @@
         if (auto caption = tableElement->caption()) {
             AccessibilityObject* axCaption = axObjectCache()->getOrCreate(caption.get());
-            // While `addChild` won't insert ignored children, we still need this accessibilityIsIgnored
-            // check so that `addChild` doesn't try to add the caption's children in its stead. Basically,
-            // explicitly checking accessibilityIsIgnored() ignores the caption and any of its children.
             if (axCaption && !axCaption->accessibilityIsIgnored())
-                addChild(axCaption);
+                m_children.append(axCaption);
         }
     }
@@ -424 +421 @@
         column.setParent(this);
         m_columns.append(&column);
-        addChild(&column);
-    }
-    addChild(headerContainer());
+        if (!column.accessibilityIsIgnored())
+            m_children.append(&column);
+    }
+
+    auto* headerContainerObject = headerContainer();
+    if (headerContainerObject && !headerContainerObject->accessibilityIsIgnored())
+        m_children.append(headerContainerObject);
 
     // Sometimes the cell gets the wrong role initially because it is created before the parent
@@ -451 +452 @@
     row.setRowIndex(static_cast<int>(m_rows.size()));
     m_rows.append(&row);
-    addChild(&row);
+    if (!row.accessibilityIsIgnored())
+        m_children.append(&row);
     appendedRows.add(&row);
         

trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp

@@ -203 +203 @@
             continue;
             
-        addChild(cell);
+        m_children.append(cell);
     }
 }

trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.cpp

@@ -74 +74 @@
         return;
 
-    for (auto& columnHeader : parentTable.columnHeaders())
-        addChild(columnHeader.get());
+    m_children = parentTable.columnHeaders();
 
     for (const auto& child : m_children)

trunk/Source/WebCore/accessibility/AccessibilityTableRow.cpp

@@ -110 +110 @@
     return nullptr;
 }
-
+    
 AXCoreObject* AccessibilityTableRow::headerObject()
 {
@@ -151 +151 @@
 {
     // If the element specifies its cells through aria-owns, return that first.
-    AccessibilityChildrenVector ariaOwnedElements;
-    ariaOwnsElements(ariaOwnedElements);
-    if (ariaOwnedElements.size()) {
-        for (auto& ariaOwnedElement : ariaOwnedElements)
-            addChild(ariaOwnedElement.get());
-    }
+    AccessibilityChildrenVector ariaOwns;
+    ariaOwnsElements(ariaOwns);
+    if (ariaOwns.size())
+        m_children = WTFMove(ariaOwns);
     else
         AccessibilityRenderObject::addChildren();