Title: [209118] trunk
- Revision
- 209118
- Author
- n_w...@apple.com
- Date
- 2016-11-29 20:38:28 -0800 (Tue, 29 Nov 2016)
Log 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.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (209117 => 209118)
--- trunk/LayoutTests/ChangeLog 2016-11-30 04:37:03 UTC (rev 209117)
+++ trunk/LayoutTests/ChangeLog 2016-11-30 04:38:28 UTC (rev 209118)
@@ -1,3 +1,14 @@
+2016-11-29 Nan Wang <n_w...@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 <cdu...@apple.com>
Unreviewed, rolling out r209096, r209104, and r209114.
Added: trunk/LayoutTests/accessibility/ios-simulator/treeitem-expanded-expected.txt (0 => 209118)
--- trunk/LayoutTests/accessibility/ios-simulator/treeitem-expanded-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/ios-simulator/treeitem-expanded-expected.txt 2016-11-30 04:38:28 UTC (rev 209118)
@@ -0,0 +1,14 @@
+Projects
+Reports
+report-1.docx
+This tests that the expanded status of a treeitem is exposed to its unignored children.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS treeitem1.isExpanded is false
+PASS treeitem2.isExpanded is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/accessibility/ios-simulator/treeitem-expanded.html (0 => 209118)
--- trunk/LayoutTests/accessibility/ios-simulator/treeitem-expanded.html (rev 0)
+++ trunk/LayoutTests/accessibility/ios-simulator/treeitem-expanded.html 2016-11-30 04:38:28 UTC (rev 209118)
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script>
+var successfullyParsed = false;
+</script>
+<script src=""
+</head>
+<body id="body">
+
+<ul role="tree" id="tree1">
+<li role="treeitem" aria-expanded="false" aria-label="Projects" tabindex="0">
+ <div id="projects">Projects</div>
+ <ul role="group">
+ <li role="treeitem" style="display: none;">project-1.docx</li>
+ </ul>
+</li>
+<li role="treeitem" aria-expanded="true" aria-label="Reports" tabindex="0">
+ <div id="reports">Reports</div>
+ <ul role="group">
+ <li role="treeitem" id="treeitem1" style="display: block;">report-1.docx</li>
+ </ul>
+</ul>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that the expanded status of a treeitem is exposed to its unignored children.");
+
+ if (window.accessibilityController) {
+
+ var treeitem1 = accessibilityController.accessibleElementById("projects");
+ var treeitem2 = accessibilityController.accessibleElementById("reports");
+ shouldBeFalse("treeitem1.isExpanded");
+ shouldBeTrue("treeitem2.isExpanded");
+ }
+
+ successfullyParsed = true;
+</script>
+
+<script src=""
+</body>
+</html>
+
Modified: trunk/Source/WebCore/ChangeLog (209117 => 209118)
--- trunk/Source/WebCore/ChangeLog 2016-11-30 04:37:03 UTC (rev 209117)
+++ trunk/Source/WebCore/ChangeLog 2016-11-30 04:38:28 UTC (rev 209118)
@@ -1,3 +1,22 @@
+2016-11-29 Nan Wang <n_w...@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 <cdu...@apple.com>
Unreviewed, rolling out r209096, r209104, and r209114.
Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (209117 => 209118)
--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2016-11-30 04:37:03 UTC (rev 209117)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2016-11-30 04:38:28 UTC (rev 209118)
@@ -531,6 +531,18 @@
}
}
+- (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;
+}
+
- (AccessibilityObjectWrapper*)_accessibilityListAncestor
{
auto matchFunc = [] (const AccessibilityObject& object) {
@@ -1848,6 +1860,16 @@
return nil;
}
+- (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
{
if (![self _prepareAccessibilityCall])
@@ -2708,6 +2730,9 @@
if (AccessibilityObject* detailParent = [self detailParentForSummaryObject:m_object])
return detailParent->supportsExpanded();
+ if (AccessibilityObject* treeItemParent = [self treeItemParentForObject:m_object])
+ return treeItemParent->supportsExpanded();
+
return m_object->supportsExpanded();
}
@@ -2721,6 +2746,9 @@
if (AccessibilityObject* detailParent = [self detailParentForSummaryObject:m_object])
return detailParent->isExpanded();
+ if (AccessibilityObject* treeItemParent = [self treeItemParentForObject:m_object])
+ return treeItemParent->isExpanded();
+
return m_object->isExpanded();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
