Changeset 88830 in webkit

Timestamp:

Jun 14, 2011, 11:20:28 AM (15 years ago)

Author:

Chris Fleizach

Message:

Source/WebCore: VoiceOver cannot navigate the iTunes album view table
​https://bugs.webkit.org/show_bug.cgi?id=62335

Reviewed by David Kilzer.

This is a regression from ​https://bugs.webkit.org/show_bug.cgi?id=57463.
Part of that patch made a change so that an ARIA table will only look at it's children and grandchildren
for possible rows. That however, doesn't allow arbitrary hierarchies to work with ARIA, like in iTunes album view.

Test: platform/mac/accessibility/aria-grid-with-strange-hierarchy.html

• accessibility/AccessibilityARIAGrid.cpp:

(WebCore::AccessibilityARIAGrid::addChild):
(WebCore::AccessibilityARIAGrid::addChildren):

• accessibility/AccessibilityARIAGrid.h:

LayoutTests: VoiceOver cannot navigate the itunes album view table
​https://bugs.webkit.org/show_bug.cgi?id=62335

Reviewed by David Kilzer.

• platform/mac/accessibility/aria-grid-with-strange-hierarchy-expected.txt: Added.
• platform/mac/accessibility/aria-grid-with-strange-hierarchy.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/accessibility/aria-grid-with-strange-hierarchy-expected.txt (added)
• LayoutTests/platform/mac/accessibility/aria-grid-with-strange-hierarchy.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityARIAGrid.cpp (modified) (3 diffs)
• Source/WebCore/accessibility/AccessibilityARIAGrid.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-14  Chris Fleizach  <cfleizach@apple.com>
+
+        Reviewed by David Kilzer.
+
+        VoiceOver cannot navigate the itunes album view table
+        https://bugs.webkit.org/show_bug.cgi?id=62335
+
+        * platform/mac/accessibility/aria-grid-with-strange-hierarchy-expected.txt: Added.
+        * platform/mac/accessibility/aria-grid-with-strange-hierarchy.html: Added.
+
 2011-06-13  Adrienne Walker  <enne@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-14  Chris Fleizach  <cfleizach@apple.com>
+
+        Reviewed by David Kilzer.
+
+        VoiceOver cannot navigate the iTunes album view table
+        https://bugs.webkit.org/show_bug.cgi?id=62335
+
+        This is a regression from https://bugs.webkit.org/show_bug.cgi?id=57463.
+        Part of that patch made a change so that an ARIA table will only look at it's children and grandchildren
+        for possible rows. That however, doesn't allow arbitrary hierarchies to work with ARIA, like in iTunes album view.
+
+        Test: platform/mac/accessibility/aria-grid-with-strange-hierarchy.html
+
+        * accessibility/AccessibilityARIAGrid.cpp:
+        (WebCore::AccessibilityARIAGrid::addChild):
+        (WebCore::AccessibilityARIAGrid::addChildren):
+        * accessibility/AccessibilityARIAGrid.h:
+
 2011-06-14  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/accessibility/AccessibilityARIAGrid.cpp

@@ -60 +60 @@
 }
 
-void AccessibilityARIAGrid::addChild(AccessibilityObject* child, HashSet<AccessibilityObject*>& appendedRows, unsigned& columnCount)
+bool AccessibilityARIAGrid::addChild(AccessibilityObject* child, HashSet<AccessibilityObject*>& appendedRows, unsigned& columnCount)
 {
     if (!child || !child->isTableRow() || child->ariaRoleAttribute() != RowRole)
-        return;
+        return false;
         
     AccessibilityTableRow* row = static_cast<AccessibilityTableRow*>(child);
     if (appendedRows.contains(row))
-        return;
+        return false;
         
     // store the maximum number of columns
@@ -85 +85 @@
 
     appendedRows.add(row);
+    return true;
 }
     
@@ -107 +108 @@
     for (RefPtr<AccessibilityObject> child = firstChild(); child; child = child->nextSibling()) {
 
-        if (child->isTableRow() || child->ariaRoleAttribute() == RowRole)
-            addChild(child.get(), appendedRows, columnCount);
-        else {
+        if (!addChild(child.get(), appendedRows, columnCount)) {
+            
             // in case the render tree doesn't match the expected ARIA hierarchy, look at the children
             if (!child->hasChildren())
                 child->addChildren();
 
-            // Do not navigate children through the Accessibility
-            // children vector to let addChild() check the result
-            // of accessibilityIsIgnored() and make the proper
-            // decision (add the objects or their children).
-            AccessibilityObject* grandChild = 0;
-            for (grandChild = child->firstChild(); grandChild; grandChild = grandChild->nextSibling())
-                addChild(grandChild, appendedRows, columnCount);
+            // The children of this non-row will contain all non-ignored elements (recursing to find them). 
+            // This allows the table to dive arbitrarily deep to find the rows.
+            AccessibilityChildrenVector children = child->children();
+            size_t length = children.size();
+            for (size_t i = 0; i < length; ++i)
+                addChild(children[i].get(), appendedRows, columnCount);
         }
     }

trunk/Source/WebCore/accessibility/AccessibilityARIAGrid.h

@@ -56 +56 @@
     virtual bool supportsSelectedRows() { return true; }    
 
-    void addChild(AccessibilityObject*, HashSet<AccessibilityObject*>& appendedRows, unsigned& columnCount);
+    bool addChild(AccessibilityObject*, HashSet<AccessibilityObject*>& appendedRows, unsigned& columnCount);
 };