Changeset 188769 in webkit

Timestamp:

Aug 21, 2015 12:55:53 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

AX: Table with CSS that makes a row anonymous can return NULL from cellForColumnAndRow
​https://bugs.webkit.org/show_bug.cgi?id=148293

Patch by Doug Russell <​d_russell@apple.com> on 2015-08-21
Reviewed by Chris Fleizach.

When RenderTableRows are anonymous, they may not be added to the accessible data
table's internal row list. However, when calculating the row range for a cell,
we were still accounting for those anonymous sections.
Change how the row range is calculated to directly ask the accessible parent row
for its index. This will ensure it’s more inline with what’s being represented to
the accessibility API.

Source/WebCore:

Test: accessibility/aria-table-content.html

• accessibility/AccessibilityTableCell.cpp:

(WebCore::AccessibilityTableCell::parentRow):
(WebCore::AccessibilityTableCell::rowIndexRange):

• accessibility/AccessibilityTableCell.h:

LayoutTests:

• accessibility/aria-table-content-expected.txt: Added.
• accessibility/aria-table-content.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/aria-table-content-expected.txt (added)
• LayoutTests/accessibility/aria-table-content.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityTableCell.cpp (modified) (2 diffs)
• Source/WebCore/accessibility/AccessibilityTableCell.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-08-21  Doug Russell  <d_russell@apple.com>
+
+        AX: Table with CSS that makes a row anonymous can return NULL from cellForColumnAndRow
+        https://bugs.webkit.org/show_bug.cgi?id=148293
+
+        Reviewed by Chris Fleizach.
+
+        When RenderTableRows are anonymous, they may not be added to the accessible data 
+        table's internal row list. However, when calculating the row range for a cell, 
+        we were still accounting for those anonymous sections.
+        Change how the row range is calculated to directly ask the accessible parent row 
+        for its index. This will ensure it’s more inline with what’s being represented to 
+        the accessibility API.
+
+        * accessibility/aria-table-content-expected.txt: Added.
+        * accessibility/aria-table-content.html: Added.
+
 2015-08-21  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-08-21  Doug Russell  <d_russell@apple.com>
+
+        AX: Table with CSS that makes a row anonymous can return NULL from cellForColumnAndRow
+        https://bugs.webkit.org/show_bug.cgi?id=148293
+
+        Reviewed by Chris Fleizach.
+
+        When RenderTableRows are anonymous, they may not be added to the accessible data 
+        table's internal row list. However, when calculating the row range for a cell, 
+        we were still accounting for those anonymous sections.
+        Change how the row range is calculated to directly ask the accessible parent row 
+        for its index. This will ensure it’s more inline with what’s being represented to 
+        the accessibility API.
+
+        Test: accessibility/aria-table-content.html
+
+        * accessibility/AccessibilityTableCell.cpp:
+        (WebCore::AccessibilityTableCell::parentRow):
+        (WebCore::AccessibilityTableCell::rowIndexRange):
+        * accessibility/AccessibilityTableCell.h:
+
 2015-08-21  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp

@@ -303 +303 @@
     }
 }
-    
+
+AccessibilityTableRow* AccessibilityTableCell::parentRow() const
+{
+    AccessibilityObject* parent = parentObjectUnignored();
+    if (!is<AccessibilityTableRow>(*parent))
+        return nullptr;
+    return downcast<AccessibilityTableRow>(parent);
+}
+
 void AccessibilityTableCell::rowIndexRange(std::pair<unsigned, unsigned>& rowRange) const
 {
@@ -310 +318 @@
     
     RenderTableCell& renderCell = downcast<RenderTableCell>(*m_renderer);
-    rowRange.first = renderCell.rowIndex();
     rowRange.second = renderCell.rowSpan();
     
-    // since our table might have multiple sections, we have to offset our row appropriately
-    RenderTableSection* section = renderCell.section();
-    RenderTable* table = renderCell.table();
-    if (!table || !section)
-        return;
-
-    RenderTableSection* footerSection = table->footer();
-    unsigned rowOffset = 0;
-    for (RenderTableSection* tableSection = table->topSection(); tableSection; tableSection = table->sectionBelow(tableSection, SkipEmptySections)) {
-        // Don't add row offsets for bottom sections that are placed in before the body section.
-        if (tableSection == footerSection)
-            continue;
-        if (tableSection == section) {
-            // If the table section is anonymous, we should to use the parent row's API to get the rowIndex
-            if (tableSection->isAnonymous()) {
-                AccessibilityObject* parent = parentObjectUnignored();
-                if (is<AccessibilityTableRow>(*parent))
-                    rowOffset = downcast<AccessibilityTableRow>(*parent).rowIndex();
-            }
-            break;
-        }
-        rowOffset += tableSection->numRows();
-    }
-
-    rowRange.first += rowOffset;
+    if (AccessibilityTableRow* parentRow = this->parentRow())
+        rowRange.first = parentRow->rowIndex();
 }
     

trunk/Source/WebCore/accessibility/AccessibilityTableCell.h

@@ -35 +35 @@
     
 class AccessibilityTable;
-    
+class AccessibilityTableRow;
+
 class AccessibilityTableCell : public AccessibilityRenderObject {
 public:
@@ -57 +58 @@
     explicit AccessibilityTableCell(RenderObject*);
 
+    AccessibilityTableRow* parentRow() const;
     virtual AccessibilityTable* parentTable() const;
     virtual AccessibilityRole determineAccessibilityRole() override final;