Changeset 207647 in webkit

Timestamp:

Oct 20, 2016 6:15:21 PM (8 years ago)

Author:

n_wang@apple.com

Message:

AX: VoiceOver is not detecting ARIA treeview if it contains role="presentation"
​https://bugs.webkit.org/show_bug.cgi?id=163763

Reviewed by Chris Fleizach.

Source/WebCore:

Test: accessibility/mac/aria-tree-with-presentation-role.html

Web authors sometimes use presentation role in the aria tree to hide elements. We should
consider this a valid case if they specify tree items and groups correctly.

• accessibility/AccessibilityNodeObject.cpp:

(WebCore::AccessibilityNodeObject::hierarchicalLevel):

• accessibility/AccessibilityTree.cpp:

(WebCore::AccessibilityTree::nodeHasTreeItemChild):
(WebCore::AccessibilityTree::isTreeValid):

• accessibility/AccessibilityTree.h:

LayoutTests:

• accessibility/mac/aria-tree-with-presentation-role-expected.txt: Added.
• accessibility/mac/aria-tree-with-presentation-role.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/mac/aria-tree-with-presentation-role-expected.txt (added)
• LayoutTests/accessibility/mac/aria-tree-with-presentation-role.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityNodeObject.cpp (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityTree.cpp (modified) (2 diffs)
• Source/WebCore/accessibility/AccessibilityTree.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-20  Nan Wang  <n_wang@apple.com>
+
+        AX: VoiceOver is not detecting ARIA treeview if it contains role="presentation"
+        https://bugs.webkit.org/show_bug.cgi?id=163763
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/mac/aria-tree-with-presentation-role-expected.txt: Added.
+        * accessibility/mac/aria-tree-with-presentation-role.html: Added.
+
 2016-10-19  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-20  Nan Wang  <n_wang@apple.com>
+
+        AX: VoiceOver is not detecting ARIA treeview if it contains role="presentation"
+        https://bugs.webkit.org/show_bug.cgi?id=163763
+
+        Reviewed by Chris Fleizach.
+
+        Test: accessibility/mac/aria-tree-with-presentation-role.html
+
+        Web authors sometimes use presentation role in the aria tree to hide elements. We should
+        consider this a valid case if they specify tree items and groups correctly.
+
+        * accessibility/AccessibilityNodeObject.cpp:
+        (WebCore::AccessibilityNodeObject::hierarchicalLevel):
+        * accessibility/AccessibilityTree.cpp:
+        (WebCore::AccessibilityTree::nodeHasTreeItemChild):
+        (WebCore::AccessibilityTree::isTreeValid):
+        * accessibility/AccessibilityTree.h:
+
 2016-10-20  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp

@@ -1616 +1616 @@
     unsigned level = 1;
     for (AccessibilityObject* parent = parentObject(); parent; parent = parent->parentObject()) {
-        AccessibilityRole parentRole = parent->roleValue();
+        AccessibilityRole parentRole = parent->ariaRoleAttribute();
         if (parentRole == GroupRole)
             level++;

trunk/Source/WebCore/accessibility/AccessibilityTree.cpp

@@ -68 +68 @@
 }
 
+bool AccessibilityTree::nodeHasTreeItemChild(Node& node) const
+{
+    for (auto* child = node.firstChild(); child; child = child->nextSibling()) {
+        if (nodeHasRole(child, "treeitem"))
+            return true;
+    }
+    return false;
+}
+
 bool AccessibilityTree::isTreeValid() const
 {
@@ -88 +97 @@
         if (nodeHasRole(child, "treeitem"))
             continue;
+        if (nodeHasRole(child, "presentation")) {
+            if (!nodeHasTreeItemChild(*child))
+                return false;
+            continue;
+        }
         if (!nodeHasRole(child, "group"))
             return false;

trunk/Source/WebCore/accessibility/AccessibilityTree.h

@@ -45 +45 @@
     AccessibilityRole determineAccessibilityRole() override;
     bool isTreeValid() const;
+    bool nodeHasTreeItemChild(Node&) const;
 };