Changeset 261729 in webkit

Timestamp:

May 14, 2020 7:28:43 PM (4 years ago)

Author:

Andres Gonzalez

Message:

Expose isColumnHeaderCell and isRowHeaderCell through AXCoreObject.
​https://bugs.webkit.org/show_bug.cgi?id=211919

Reviewed by Chris Fleizach.

Multiple tests including accessibility/crash-table-recursive-layout.html.

• Expose isColumn/RowHeaderCell through AXCoreObject in order to make the

return value of AccessibilityTable::cellForColumnAndRow an AXCoreObject.

• Implemented these methods for AXIsolatedObject.
• isolatedCopy the accessibilityDescription property.

• accessibility/AccessibilityObject.h:
• accessibility/AccessibilityObjectInterface.h:
• accessibility/AccessibilityTable.cpp:

(WebCore::AccessibilityTable::cellForColumnAndRow): Removed incorrect
assert since children are AXCoreObjects and not necessarily AccessibilityTableCells.

• accessibility/AccessibilityTable.h:
• accessibility/AccessibilityTableCell.cpp:

(WebCore::AccessibilityTableCell::isTableCellInSameRowGroup):
(WebCore::AccessibilityTableCell::isTableCellInSameColGroup):
(WebCore::AccessibilityTableCell::columnHeaders):
(WebCore::AccessibilityTableCell::rowHeaders):

• accessibility/AccessibilityTableCell.h:
• accessibility/AccessibilityTableColumn.cpp:

(WebCore::AccessibilityTableColumn::addChildren):

• accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:

(-[WebAccessibilityObjectWrapper accessibilityElementForRow:andColumn:]):

• accessibility/isolatedtree/AXIsolatedObject.cpp:

(WebCore::AXIsolatedObject::initializeAttributeData):

• accessibility/isolatedtree/AXIsolatedObject.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityObject.h (modified) (1 diff)
• accessibility/AccessibilityObjectInterface.h (modified) (1 diff)
• accessibility/AccessibilityTable.cpp (modified) (3 diffs)
• accessibility/AccessibilityTable.h (modified) (1 diff)
• accessibility/AccessibilityTableCell.cpp (modified) (4 diffs)
• accessibility/AccessibilityTableCell.h (modified) (2 diffs)
• accessibility/AccessibilityTableColumn.cpp (modified) (1 diff)
• accessibility/atk/WebKitAccessibleInterfaceTable.cpp (modified) (5 diffs)
• accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (modified) (1 diff)
• accessibility/isolatedtree/AXIsolatedObject.cpp (modified) (2 diffs)
• accessibility/isolatedtree/AXIsolatedObject.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-14  Andres Gonzalez  <andresg_22@apple.com>
+
+        Expose isColumnHeaderCell and isRowHeaderCell through AXCoreObject.
+        https://bugs.webkit.org/show_bug.cgi?id=211919
+
+        Reviewed by Chris Fleizach.
+
+        Multiple tests including accessibility/crash-table-recursive-layout.html.
+
+        - Expose isColumn/RowHeaderCell through AXCoreObject in order to make the
+        return value of AccessibilityTable::cellForColumnAndRow an AXCoreObject.
+        - Implemented these methods for AXIsolatedObject.
+        - isolatedCopy the accessibilityDescription property.
+
+        * accessibility/AccessibilityObject.h:
+        * accessibility/AccessibilityObjectInterface.h:
+        * accessibility/AccessibilityTable.cpp:
+        (WebCore::AccessibilityTable::cellForColumnAndRow): Removed incorrect
+        assert since children are AXCoreObjects and not necessarily AccessibilityTableCells.
+        * accessibility/AccessibilityTable.h:
+        * accessibility/AccessibilityTableCell.cpp:
+        (WebCore::AccessibilityTableCell::isTableCellInSameRowGroup):
+        (WebCore::AccessibilityTableCell::isTableCellInSameColGroup):
+        (WebCore::AccessibilityTableCell::columnHeaders):
+        (WebCore::AccessibilityTableCell::rowHeaders):
+        * accessibility/AccessibilityTableCell.h:
+        * accessibility/AccessibilityTableColumn.cpp:
+        (WebCore::AccessibilityTableColumn::addChildren):
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityElementForRow:andColumn:]):
+        * accessibility/isolatedtree/AXIsolatedObject.cpp:
+        (WebCore::AXIsolatedObject::initializeAttributeData):
+        * accessibility/isolatedtree/AXIsolatedObject.h:
+
 2020-05-14  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityObject.h

@@ -161 +161 @@
     // Returns the start location and column span of the cell.
     std::pair<unsigned, unsigned> columnIndexRange() const override { return { 0, 1 }; }
+    bool isColumnHeaderCell() const override { return false; }
+    bool isRowHeaderCell() const override { return false; }
     int axColumnIndex() const override { return -1; }
     int axRowIndex() const override { return -1; }

trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h

@@ -564 +564 @@
     // Returns the start location and column span of the cell.
     virtual std::pair<unsigned, unsigned> columnIndexRange() const = 0;
+    virtual bool isColumnHeaderCell() const = 0;
+    virtual bool isRowHeaderCell() const = 0;
     virtual int axColumnIndex() const = 0;
     virtual int axRowIndex() const = 0;

trunk/Source/WebCore/accessibility/AccessibilityTable.cpp

@@ -620 +620 @@
 }
 
-AccessibilityTableCell* AccessibilityTable::cellForColumnAndRow(unsigned column, unsigned row)
+AXCoreObject* AccessibilityTable::cellForColumnAndRow(unsigned column, unsigned row)
 {
     updateChildrenIfNecessary();
@@ -635 +635 @@
             unsigned colIndex = colIndexCounter - 1;
             AXCoreObject* child = children[colIndex].get();
-            ASSERT(is<AccessibilityTableCell>(*child));
-            if (!is<AccessibilityTableCell>(*child))
+            if (!child)
                 continue;
 
@@ -644 +643 @@
             if ((column >= columnRange.first && column < (columnRange.first + columnRange.second))
                 && (row >= rowRange.first && row < (rowRange.first + rowRange.second)))
-                return downcast<AccessibilityTableCell>(child);
+                return child;
         }
     }

trunk/Source/WebCore/accessibility/AccessibilityTable.h

@@ -62 +62 @@
     // all the cells in the table
     AccessibilityChildrenVector cells() override;
-    AccessibilityTableCell* cellForColumnAndRow(unsigned column, unsigned row) override;
+    AXCoreObject* cellForColumnAndRow(unsigned column, unsigned row) override;
 
     AccessibilityChildrenVector columnHeaders() override;

trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp

@@ -201 +201 @@
 }
 
-bool AccessibilityTableCell::isTableCellInSameRowGroup(AccessibilityTableCell* otherTableCell)
+bool AccessibilityTableCell::isTableCellInSameRowGroup(AXCoreObject* otherTableCell)
 {
     Node* parentNode = node();
@@ -218 +218 @@
 }
 
-
-bool AccessibilityTableCell::isTableCellInSameColGroup(AccessibilityTableCell* tableCell)
+bool AccessibilityTableCell::isTableCellInSameColGroup(AXCoreObject* tableCell)
 {
     auto colRange = columnIndexRange();
@@ -256 +255 @@
 
     for (unsigned row = 0; row < rowRange.first; row++) {
-        AccessibilityTableCell* tableCell = parent->cellForColumnAndRow(colRange.first, row);
+        auto* tableCell = parent->cellForColumnAndRow(colRange.first, row);
         if (!tableCell || tableCell == this || headers.contains(tableCell))
             continue;
@@ -281 +280 @@
 
     for (unsigned column = 0; column < colRange.first; column++) {
-        AccessibilityTableCell* tableCell = parent->cellForColumnAndRow(column, rowRange.first);
+        auto* tableCell = parent->cellForColumnAndRow(column, rowRange.first);
         if (!tableCell || tableCell == this || headers.contains(tableCell))
             continue;

trunk/Source/WebCore/accessibility/AccessibilityTableCell.h

@@ -43 +43 @@
     bool isTableCell() const final;
     bool isTableHeaderCell() const;
-    bool isColumnHeaderCell() const;
-    bool isRowHeaderCell() const;
+    bool isColumnHeaderCell() const override;
+    bool isRowHeaderCell() const override;
 
     // Returns the start location and row span of the cell.
@@ -78 +78 @@
     bool supportsExpandedTextValue() const final;
 
-    bool isTableCellInSameRowGroup(AccessibilityTableCell*);
-    bool isTableCellInSameColGroup(AccessibilityTableCell*);
+    bool isTableCellInSameRowGroup(AXCoreObject*);
+    bool isTableCellInSameColGroup(AXCoreObject*);
 };
 

trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp

@@ -195 +195 @@
     
     for (int i = 0; i < numRows; ++i) {
-        AccessibilityTableCell* cell = parentTable.cellForColumnAndRow(m_columnIndex, i);
+        auto* cell = parentTable.cellForColumnAndRow(m_columnIndex, i);
         if (!cell)
             continue;

trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp

@@ -55 +55 @@
 }
 
-static AccessibilityTableCell* cell(AtkTable* table, guint row, guint column)
-{
-    AccessibilityObject* accTable = core(table);
-    if (is<AccessibilityTable>(*accTable))
-        return downcast<AccessibilityTable>(*accTable).cellForColumnAndRow(column, row);
-    return nullptr;
-}
-
-static gint cellIndex(AccessibilityTableCell* axCell, AccessibilityTable* axTable)
+static AXCoreObject* cell(AtkTable* table, guint row, guint column)
+{
+    auto* accTable = core(table);
+    return accTable ? accTable->cellForColumnAndRow(column, row) : nullptr;
+}
+
+static gint cellIndex(AXCoreObject* axCell, AccessibilityTable* axTable)
 {
     // Calculate the cell's index as if we had a traditional Gtk+ table in
     // which cells are all direct children of the table, arranged row-first.
     auto allCells = axTable->cells();
-    AccessibilityObject::AccessibilityChildrenVector::iterator position;
+    AXCoreObject::AccessibilityChildrenVector::iterator position;
     position = std::find(allCells.begin(), allCells.end(), axCell);
     if (position == allCells.end())
@@ -91 +89 @@
     returnValIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(table), 0);
 
-    AccessibilityTableCell* axCell = cell(table, row, column);
+    auto* axCell = cell(table, row, column);
     if (!axCell)
         return 0;
@@ -109 +107 @@
     returnValIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(table), -1);
 
-    AccessibilityTableCell* axCell = cell(table, row, column);
+    auto* axCell = cell(table, row, column);
     AccessibilityTable* axTable = downcast<AccessibilityTable>(core(table));
     return cellIndex(axCell, axTable);
@@ -175 +173 @@
     returnValIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(table), 0);
 
-    AccessibilityTableCell* axCell = cell(table, row, column);
+    auto* axCell = cell(table, row, column);
     if (axCell) {
         auto columnRange = axCell->columnIndexRange();
@@ -188 +186 @@
     returnValIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(table), 0);
 
-    AccessibilityTableCell* axCell = cell(table, row, column);
+    auto* axCell = cell(table, row, column);
     if (axCell) {
         auto rowRange = axCell->rowIndexRange();

trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm

@@ -1268 +1268 @@
         return nil;
 
-    AccessibilityTableCell* cell = table->cellForColumnAndRow(column, row);
-    if (!cell)
-        return nil;
-    return cell->wrapper();
+    auto* cell = table->cellForColumnAndRow(column, row);
+    return cell ? cell->wrapper() : nil;
 }
 

trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp

@@ -61 +61 @@
 {
     setProperty(AXPropertyName::ARIALandmarkRoleDescription, object.ariaLandmarkRoleDescription().isolatedCopy());
-    setProperty(AXPropertyName::AccessibilityDescription, object.accessibilityDescription());
+    setProperty(AXPropertyName::AccessibilityDescription, object.accessibilityDescription().isolatedCopy());
     setProperty(AXPropertyName::BoundingBoxRect, object.boundingBoxRect());
     setProperty(AXPropertyName::Description, object.descriptionAttributeValue().isolatedCopy());
@@ -251 +251 @@
         setObjectVectorProperty(AXPropertyName::ColumnHeaders, object.columnHeaders());
         setObjectVectorProperty(AXPropertyName::RowHeaders, object.rowHeaders());
+        setProperty(AXPropertyName::IsColumnHeaderCell, object.isColumnHeaderCell());
+        setProperty(AXPropertyName::IsRowHeaderCell, object.isRowHeaderCell());
         setProperty(AXPropertyName::AXColumnIndex, object.axColumnIndex());
         setProperty(AXPropertyName::AXRowIndex, object.axRowIndex());

trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h

@@ -175 +175 @@
         IsChecked,
         IsCollapsed,
+        IsColumnHeaderCell,
         IsControl,
         IsDataTable,
@@ -239 +240 @@
         IsRangeControl,
         IsRequired,
+        IsRowHeaderCell,
         IsScrollbar,
         IsSearchField,
@@ -427 +429 @@
     // Returns the start location and column span of the cell.
     std::pair<unsigned, unsigned> columnIndexRange() const override { return pairAttributeValue<unsigned>(AXPropertyName::ColumnIndexRange); }
+    bool isColumnHeaderCell() const override { return boolAttributeValue(AXPropertyName::IsColumnHeaderCell); }
+    bool isRowHeaderCell() const override { return boolAttributeValue(AXPropertyName::IsRowHeaderCell); }
     int axColumnIndex() const override { return intAttributeValue(AXPropertyName::AXColumnIndex); }
     int axRowIndex() const override { return intAttributeValue(AXPropertyName::AXRowIndex); }