Changeset 174860 in webkit

Timestamp:

Oct 18, 2014 8:20:38 AM (10 years ago)

Author:

Chris Fleizach

Message:

AX: Tables with <colgroups> are not reporting table column headers
​https://bugs.webkit.org/show_bug.cgi?id=137846

Reviewed by Mario Sanchez Prada.

Source/WebCore:

The code to search for header objects was getting stuck on anonymous RenderTableSections.
We also need to check more rows for headers, in case the first row or more is not visible or is empty.

Test: accessibility/table-column-headers-with-captions.html

• accessibility/AccessibilityTableColumn.cpp:

(WebCore::AccessibilityTableColumn::headerObject):
(WebCore::AccessibilityTableColumn::headerObjectForSection):

LayoutTests:

• accessibility/table-column-headers-with-captions-expected.txt: Added.
• accessibility/table-column-headers-with-captions.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/table-column-headers-with-captions-expected.txt (added)
• LayoutTests/accessibility/table-column-headers-with-captions.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityTableColumn.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-10-18  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: Tables with <colgroups> are not reporting table column headers
+        https://bugs.webkit.org/show_bug.cgi?id=137846
+
+        Reviewed by Mario Sanchez Prada.
+
+        * accessibility/table-column-headers-with-captions-expected.txt: Added.
+        * accessibility/table-column-headers-with-captions.html: Added.
+
 2014-10-17  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-10-18  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: Tables with <colgroups> are not reporting table column headers
+        https://bugs.webkit.org/show_bug.cgi?id=137846
+
+        Reviewed by Mario Sanchez Prada.
+
+        The code to search for header objects was getting stuck on anonymous RenderTableSections.
+        We also need to check more rows for headers, in case the first row or more is not visible or is empty.
+
+        Test: accessibility/table-column-headers-with-captions.html
+
+        * accessibility/AccessibilityTableColumn.cpp:
+        (WebCore::AccessibilityTableColumn::headerObject):
+        (WebCore::AccessibilityTableColumn::headerObjectForSection):
+
 2014-10-18  KwangHyuk Kim  <hyuki.kim@samsung.com>
 

trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp

@@ -99 +99 @@
         return headerObject;
     
-    // now try for <th> tags in the first body
-    return headerObjectForSection(table.firstBody(), true);
+    RenderTableSection* bodySection = table.firstBody();
+    while (bodySection && bodySection->isAnonymous())
+        bodySection = table.sectionBelow(bodySection, SkipEmptySections);
+    
+    // now try for <th> tags in the first body. If the first body is 
+    return headerObjectForSection(bodySection, true);
 }
 
@@ -118 +122 @@
     // also account for cells that have a span
     for (int testCol = m_columnIndex; testCol >= 0; --testCol) {
-        RenderTableCell* testCell = section->primaryCellAt(0, testCol);
-        if (!testCell)
-            continue;
         
-        // we've reached a cell that doesn't even overlap our column 
-        // it can't be our header
-        if ((testCell->col() + (testCell->colSpan()-1)) < m_columnIndex)
+        // Run down the rows in case initial rows are invalid (like when a <caption> is used).
+        unsigned rowCount = section->numRows();
+        for (unsigned testRow = 0; testRow < rowCount; testRow++) {
+            RenderTableCell* testCell = section->primaryCellAt(testRow, testCol);
+            // No cell at this index, keep checking more rows and columns.
+            if (!testCell)
+                continue;
+            
+            // If we've reached a cell that doesn't even overlap our column it can't be the header.
+            if ((testCell->col() + (testCell->colSpan()-1)) < m_columnIndex)
+                break;
+            
+            // If this does not have an element (like a <caption>) then check the next row
+            if (!testCell->element())
+                continue;
+            
+            // If th is required, but we found an element that doesn't have a th tag, we can stop looking.
+            if (thTagRequired && !testCell->element()->hasTagName(thTag))
+                break;
+            
+            cell = testCell;
             break;
-        
-        if (!testCell->element())
-            continue;
-        
-        if (thTagRequired && !testCell->element()->hasTagName(thTag))
-            continue;
-        
-        cell = testCell;
+        }
     }