<!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>[187935] 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/187935">187935</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-04 20:38:58 -0700 (Tue, 04 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: tree item children returned from ranged getter are different from full array of children
https://bugs.webkit.org/show_bug.cgi?id=147660
Source/WebCore:
Patch by Doug Russell <d_russell@apple.com> on 2015-08-04
Reviewed by Chris Fleizach.
Add an isTreeItem() check in ranged element getter so that it matches the logic in
the getter for the full children array. This prevents returning a row as a child
when only the rows contents should be returned. This prevents navigation issues on
websites without aria outlines.
Test: accessibility/mac/aria-tree-item-children.html
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityArrayAttributeValues:index:maxCount:]):
LayoutTests:
Add an isTreeItem() check in ranged element getter so that it matches the logic in
the getter for the full children array. This prevents returning a row as a child
when only the rows contents should be returned. This prevents navigation issues on
websites without aria outlines.
Patch by Doug Russell <d_russell@apple.com> on 2015-08-04
Reviewed by Chris Fleizach.
* accessibility/mac/aria-tree-item-children-expected.txt: Added.
* accessibility/mac/aria-tree-item-children.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="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitymacariatreeitemchildrenexpectedtxt">trunk/LayoutTests/accessibility/mac/aria-tree-item-children-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacariatreeitemchildrenhtml">trunk/LayoutTests/accessibility/mac/aria-tree-item-children.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (187934 => 187935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-05 03:33:18 UTC (rev 187934)
+++ trunk/LayoutTests/ChangeLog 2015-08-05 03:38:58 UTC (rev 187935)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-08-04 Doug Russell <d_russell@apple.com>
+
+ AX: tree item children returned from ranged getter are different from full array of children
+ https://bugs.webkit.org/show_bug.cgi?id=147660
+
+ Add an isTreeItem() check in ranged element getter so that it matches the logic in
+ the getter for the full children array. This prevents returning a row as a child
+ when only the rows contents should be returned. This prevents navigation issues on
+ websites without aria outlines.
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/mac/aria-tree-item-children-expected.txt: Added.
+ * accessibility/mac/aria-tree-item-children.html: Added.
+
</ins><span class="cx"> 2015-08-04 Hunseop Jeong <hs85.jeong@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Editing tests have been broken since r186694
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacariatreeitemchildrenexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/aria-tree-item-children-expected.txt (0 => 187935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/aria-tree-item-children-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/mac/aria-tree-item-children-expected.txt 2015-08-05 03:38:58 UTC (rev 187935)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Animals
+Birds
+This tests that aria tree items can be fetched as either a full list of children or via range getter to ensure the range getter isn't returning a row as it's first child.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS tree.role is 'AXRole: AXOutline'
+PASS child1 == child2 is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacariatreeitemchildrenhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/aria-tree-item-children.html (0 => 187935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/aria-tree-item-children.html (rev 0)
+++ trunk/LayoutTests/accessibility/mac/aria-tree-item-children.html 2015-08-05 03:38:58 UTC (rev 187935)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body id="body">
+
+<ul id="tree" role="tree" aria-labelledby="treelabel" aria-activedescendant="tree0_item0_2_0_1" tabindex="0">
+ <li id="treeitem1" role="treeitem" aria-level="1" aria-expanded="true">
+ <span>
+ <span class="expander"></span>
+ Animals
+ </span>
+ <ul role="group">
+ <div id="treeitem2" role="treeitem" aria-level="2"><span>Birds</span></div>
+ </ul>
+ </span>
+ </li>
+</ul>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that aria tree items can be fetched as either a full list of children or via range getter to ensure the range getter isn't returning a row as it's first child.");
+
+ if (window.accessibilityController) {
+
+ var tree = accessibilityController.accessibleElementById("tree")
+ shouldBe("tree.role", "'AXRole: AXOutline'");
+
+ var treeitem = tree.childAtIndex(0);
+ var child1 = treeitem.childAtIndex(0);
+ var child2 = treeitem.uiElementArrayAttributeValue("AXChildren")[0];
+ shouldBe("child1 == child2", "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 (187934 => 187935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-05 03:33:18 UTC (rev 187934)
+++ trunk/Source/WebCore/ChangeLog 2015-08-05 03:38:58 UTC (rev 187935)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-08-04 Doug Russell <d_russell@apple.com>
+
+ AX: tree item children returned from ranged getter are different from full array of children
+ https://bugs.webkit.org/show_bug.cgi?id=147660
+
+ Reviewed by Chris Fleizach.
+
+ Add an isTreeItem() check in ranged element getter so that it matches the logic in
+ the getter for the full children array. This prevents returning a row as a child
+ when only the rows contents should be returned. This prevents navigation issues on
+ websites without aria outlines.
+
+ Test: accessibility/mac/aria-tree-item-children.html
+
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityArrayAttributeValues:index:maxCount:]):
+
</ins><span class="cx"> 2015-08-04 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> CTTE the database task code
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (187934 => 187935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-08-05 03:33:18 UTC (rev 187934)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-08-05 03:38:58 UTC (rev 187935)
</span><span class="lines">@@ -4048,8 +4048,9 @@
</span><span class="cx">
</span><span class="cx"> NSUInteger arrayLength = std::min(childCount - index, maxCount);
</span><span class="cx"> return [children subarrayWithRange:NSMakeRange(index, arrayLength)];
</span><del>- } else if (m_object->isTree()) {
- // Tree objects return their rows as their children. We can use the original method in this case.
</del><ins>+ } else if (m_object->isTree() || m_object->isTreeItem()) {
+ // Tree objects return their rows as their children & tree items return their contents sans rows.
+ // We can use the original method in this case.
</ins><span class="cx"> return [super accessibilityArrayAttributeValues:attribute index:index maxCount:maxCount];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>