<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209118] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209118">209118</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2016-11-29 20:38:28 -0800 (Tue, 29 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatortreeitemexpandedexpectedtxt">trunk/LayoutTests/accessibility/ios-simulator/treeitem-expanded-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatortreeitemexpandedhtml">trunk/LayoutTests/accessibility/ios-simulator/treeitem-expanded.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209117 => 209118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-30 04:37:03 UTC (rev 209117)
+++ trunk/LayoutTests/ChangeLog 2016-11-30 04:38:28 UTC (rev 209118)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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.
+
</ins><span class="cx"> 2016-11-29 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r209096, r209104, and r209114.
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatortreeitemexpandedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/ios-simulator/treeitem-expanded-expected.txt (0 => 209118)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+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
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatortreeitemexpandedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/ios-simulator/treeitem-expanded.html (0 => 209118)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script>
+var successfullyParsed = false;
+</script>
+<script src="../../resources/js-test-pre.js"></script>
+</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="../../resources/js-test-post.js"></script>
+</body>
+</html>
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209117 => 209118)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+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]):
+
</ins><span class="cx"> 2016-11-29 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r209096, r209104, and r209114.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (209117 => 209118)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -531,6 +531,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (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;
+}
+
</ins><span class="cx"> - (AccessibilityObjectWrapper*)_accessibilityListAncestor
</span><span class="cx"> {
</span><span class="cx"> auto matchFunc = [] (const AccessibilityObject& object) {
</span><span class="lines">@@ -1848,6 +1860,16 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (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;
+}
+
</ins><span class="cx"> - (void)accessibilityElementDidBecomeFocused
</span><span class="cx"> {
</span><span class="cx"> if (![self _prepareAccessibilityCall])
</span><span class="lines">@@ -2708,6 +2730,9 @@
</span><span class="cx"> if (AccessibilityObject* detailParent = [self detailParentForSummaryObject:m_object])
</span><span class="cx"> return detailParent->supportsExpanded();
</span><span class="cx">
</span><ins>+ if (AccessibilityObject* treeItemParent = [self treeItemParentForObject:m_object])
+ return treeItemParent->supportsExpanded();
+
</ins><span class="cx"> return m_object->supportsExpanded();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2721,6 +2746,9 @@
</span><span class="cx"> if (AccessibilityObject* detailParent = [self detailParentForSummaryObject:m_object])
</span><span class="cx"> return detailParent->isExpanded();
</span><span class="cx">
</span><ins>+ if (AccessibilityObject* treeItemParent = [self treeItemParentForObject:m_object])
+ return treeItemParent->isExpanded();
+
</ins><span class="cx"> return m_object->isExpanded();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>