Changeset 209118 in webkit

Timestamp:

Nov 29, 2016 8:38:28 PM (7 years ago)

Author:

n_wang@apple.com

Message:

AX: ARIA tree & treeitem roles & aria-expanded state not spoken to VoiceOver iOS 10
​https://bugs.webkit.org/show_bug.cgi?id=164936
<rdar://problem/29334274>

Reviewed by Chris Fleizach.

Source/WebCore:

Added a new container type on iOS for trees. Also, since the treeitem role is ignored
on iOS, we should expose the expanded status of a treeitem to its accessible children.

Test: accessibility/ios-simulator/treeitem-expanded.html

• accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:

(-[WebAccessibilityObjectWrapper _accessibilityTreeAncestor]):
(-[WebAccessibilityObjectWrapper treeItemParentForObject:]):
(-[WebAccessibilityObjectWrapper accessibilitySupportsARIAExpanded]):
(-[WebAccessibilityObjectWrapper accessibilityIsExpanded]):

LayoutTests:

• accessibility/ios-simulator/treeitem-expanded-expected.txt: Added.
• accessibility/ios-simulator/treeitem-expanded.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/ios-simulator/treeitem-expanded-expected.txt (added)
• LayoutTests/accessibility/ios-simulator/treeitem-expanded.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-11-29  Nan Wang  <n_wang@apple.com>
+
+        AX: ARIA tree & treeitem roles & aria-expanded state not spoken to VoiceOver iOS 10
+        https://bugs.webkit.org/show_bug.cgi?id=164936
+        <rdar://problem/29334274>
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/ios-simulator/treeitem-expanded-expected.txt: Added.
+        * accessibility/ios-simulator/treeitem-expanded.html: Added.
+
 2016-11-29  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-11-29  Nan Wang  <n_wang@apple.com>
+
+        AX: ARIA tree & treeitem roles & aria-expanded state not spoken to VoiceOver iOS 10
+        https://bugs.webkit.org/show_bug.cgi?id=164936
+        <rdar://problem/29334274>
+
+        Reviewed by Chris Fleizach.
+
+        Added a new container type on iOS for trees. Also, since the treeitem role is ignored
+        on iOS, we should expose the expanded status of a treeitem to its accessible children.
+
+        Test: accessibility/ios-simulator/treeitem-expanded.html
+
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (-[WebAccessibilityObjectWrapper _accessibilityTreeAncestor]):
+        (-[WebAccessibilityObjectWrapper treeItemParentForObject:]):
+        (-[WebAccessibilityObjectWrapper accessibilitySupportsARIAExpanded]):
+        (-[WebAccessibilityObjectWrapper accessibilityIsExpanded]):
+
 2016-11-29  Chris Dumez  <cdumez@apple.com>
 

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

@@ -530 +530 @@
         return NO;
     }    
+}
+
+- (AccessibilityObjectWrapper*)_accessibilityTreeAncestor
+{
+    auto matchFunc = [] (const AccessibilityObject& object) {
+        AccessibilityRole role = object.roleValue();
+        return role == TreeRole;
+    };
+    
+    if (const AccessibilityObject* parent = AccessibilityObject::matchedParent(*m_object, false, matchFunc))
+        return parent->wrapper();
+    return nil;
 }
 
@@ -1849 +1861 @@
 }
 
+- (AccessibilityObject*)treeItemParentForObject:(AccessibilityObject*)object
+{
+    // Use this to check if an object is inside a treeitem object.
+    if (const AccessibilityObject* parent = AccessibilityObject::matchedParent(*object, true, [] (const AccessibilityObject& object) {
+        return object.roleValue() == TreeItemRole;
+    }))
+        return const_cast<AccessibilityObject*>(parent);
+    return nil;
+}
+
 - (void)accessibilityElementDidBecomeFocused
 {
@@ -2709 +2731 @@
         return detailParent->supportsExpanded();
     
+    if (AccessibilityObject* treeItemParent = [self treeItemParentForObject:m_object])
+        return treeItemParent->supportsExpanded();
+    
     return m_object->supportsExpanded();
 }
@@ -2721 +2746 @@
     if (AccessibilityObject* detailParent = [self detailParentForSummaryObject:m_object])
         return detailParent->isExpanded();
+    
+    if (AccessibilityObject* treeItemParent = [self treeItemParentForObject:m_object])
+        return treeItemParent->isExpanded();
     
     return m_object->isExpanded();