<!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>[183111] 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/183111">183111</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-22 10:36:44 -0700 (Wed, 22 Apr 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>AX: WebKit does not expose text fields inside tree views.
https://bugs.webkit.org/show_bug.cgi?id=142196

Patch by Nan Wang &lt;nanwang1101@yahoo.com&gt; on 2015-04-22
Reviewed by Chris Fleizach.

Source/WebCore:

The problem is that any object in a tree which is not a static text
or treeitem will be ignored. Fixed it by exposing the children of treeitem.

Test: accessibility/treeitem-child-exposed.html

* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::isAllowedChildOfTree):

LayoutTests:

Tests for treeitem’s children’s accessibility.
Also fixed the search predicate test for treeitem,
the static text is the second child of treeitem and
list marker is the first child.

* accessibility/treeitem-child-exposed-expected.txt: Added.
* accessibility/treeitem-child-exposed.html: Added.
* platform/mac/accessibility/search-predicate-expected.txt:
* platform/mac/accessibility/search-predicate.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitysearchpredicateexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/search-predicate-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitysearchpredicatehtml">trunk/LayoutTests/platform/mac/accessibility/search-predicate.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitytreeitemchildexposedexpectedtxt">trunk/LayoutTests/accessibility/treeitem-child-exposed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitytreeitemchildexposedhtml">trunk/LayoutTests/accessibility/treeitem-child-exposed.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183110 => 183111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-04-22 17:29:15 UTC (rev 183110)
+++ trunk/LayoutTests/ChangeLog        2015-04-22 17:36:44 UTC (rev 183111)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-04-22  Nan Wang  &lt;nanwang1101@yahoo.com&gt;
+
+        AX: WebKit does not expose text fields inside tree views.
+        https://bugs.webkit.org/show_bug.cgi?id=142196
+
+        Reviewed by Chris Fleizach.
+
+        Tests for treeitem’s children’s accessibility.
+        Also fixed the search predicate test for treeitem,
+        the static text is the second child of treeitem and
+        list marker is the first child.
+
+        * accessibility/treeitem-child-exposed-expected.txt: Added.
+        * accessibility/treeitem-child-exposed.html: Added.
+        * platform/mac/accessibility/search-predicate-expected.txt:
+        * platform/mac/accessibility/search-predicate.html:
+
</ins><span class="cx"> 2015-04-22  Xabier Rodriguez Calvar  &lt;calvaris@igalia.com&gt; and Youenn Fablet  &lt;youenn.fablet@crf.canon.fr&gt;
</span><span class="cx"> 
</span><span class="cx">         [Streams API] Implement ReadableStreamController
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitytreeitemchildexposedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/treeitem-child-exposed-expected.txt (0 => 183111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/treeitem-child-exposed-expected.txt                                (rev 0)
+++ trunk/LayoutTests/accessibility/treeitem-child-exposed-expected.txt        2015-04-22 17:36:44 UTC (rev 183111)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+
+

+This tests if a treeitem contains an element other than static text, it should be exposed
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+PASS tree.childrenCount is 2
+PASS inputField.isValid is true
+PASS inputField3.isValid is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitytreeitemchildexposedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/treeitem-child-exposed.html (0 => 183111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/treeitem-child-exposed.html                                (rev 0)
+++ trunk/LayoutTests/accessibility/treeitem-child-exposed.html        2015-04-22 17:36:44 UTC (rev 183111)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+&lt;!DOCTYPE HTML PUBLIC &quot;-//IETF//DTD HTML//EN&quot;&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;script src=&quot;../resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
+&lt;/head&gt;
+&lt;body id=&quot;body&quot;&gt;
+
+&lt;div role=&quot;tree&quot; id=&quot;tree&quot;&gt;
+   &lt;div role=&quot;treeitem&quot; id=&quot;item1&quot;&gt;
+      &lt;input id=&quot;input1&quot; /input&gt;
+   &lt;/div&gt;
+   &lt;input id=&quot;input2&quot; /input&gt;
+   &lt;div role=&quot;treeitem&quot; id=&quot;item2&quot;&gt;
+      &lt;row&gt;
+         &lt;input id=&quot;input3&quot; /input&gt;
+      &lt;/row&gt;
+   &lt;/div&gt;
+&lt;/div&gt;
+
+
+&lt;p id=&quot;description&quot;&gt;&lt;/p&gt;
+&lt;div id=&quot;console&quot;&gt;&lt;/div&gt;
+
+&lt;script&gt;
+
+    description(&quot;This tests if a treeitem contains an element other than static text, it should be exposed&quot;);
+
+    if (window.accessibilityController) {
+            // tree should only have 2 child, since only treeitem or static text can be a tree's child
+        var tree = accessibilityController.accessibleElementById(&quot;tree&quot;);
+        shouldBe(&quot;tree.childrenCount&quot;, &quot;2&quot;);
+        
+        // input filed in treeitem1 should be exposed
+        var inputField = accessibilityController.accessibleElementById(&quot;input1&quot;);
+        shouldBeTrue(&quot;inputField.isValid&quot;);
+        
+        // treeitem's children should be exposed, eg. the input field in treeitem2
+        var inputField3 = accessibilityController.accessibleElementById(&quot;input3&quot;);
+        shouldBeTrue(&quot;inputField3.isValid&quot;);
+    }
+
+&lt;/script&gt;
+
+&lt;script src=&quot;../resources/js-test-post.js&quot;&gt;&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitysearchpredicateexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/search-predicate-expected.txt (183110 => 183111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/search-predicate-expected.txt        2015-04-22 17:29:15 UTC (rev 183110)
+++ trunk/LayoutTests/platform/mac/accessibility/search-predicate-expected.txt        2015-04-22 17:36:44 UTC (rev 183111)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> PASS resultElement.role is 'AXRole: AXGroup'
</span><span class="cx"> PASS resultElement.stringAttributeValue('AXARIALive') is 'polite'
</span><span class="cx"> PASS resultElement.role is 'AXRole: AXOutline'
</span><del>-PASS resultElement.childAtIndex(0).childAtIndex(0).stringValue is 'AXValue: tree item'
</del><ins>+PASS resultElement.childAtIndex(0).childAtIndex(1).stringValue is 'AXValue: tree item'
</ins><span class="cx"> PASS resultElement.role is 'AXRole: AXStaticText'
</span><span class="cx"> PASS resultElement.stringValue is 'AXValue: first blockquote level 1'
</span><span class="cx"> PASS resultElement.role is 'AXRole: AXRadioGroup'
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitysearchpredicatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/search-predicate.html (183110 => 183111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/search-predicate.html        2015-04-22 17:29:15 UTC (rev 183110)
+++ trunk/LayoutTests/platform/mac/accessibility/search-predicate.html        2015-04-22 17:36:44 UTC (rev 183111)
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx">         startElement = accessibilityController.focusedElement.childAtIndex(0);
</span><span class="cx">         resultElement = containerElement.uiElementForSearchPredicate(startElement, true, &quot;AXOutlineSearchKey&quot;, &quot;&quot;, false);
</span><span class="cx">         shouldBe(&quot;resultElement.role&quot;, &quot;'AXRole: AXOutline'&quot;);
</span><del>-        shouldBe(&quot;resultElement.childAtIndex(0).childAtIndex(0).stringValue&quot;, &quot;'AXValue: tree item'&quot;);
</del><ins>+        shouldBe(&quot;resultElement.childAtIndex(0).childAtIndex(1).stringValue&quot;, &quot;'AXValue: tree item'&quot;);
</ins><span class="cx">         
</span><span class="cx">         // Plain text.
</span><span class="cx">         startElement = accessibilityController.focusedElement.childAtIndex(0);
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183110 => 183111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-04-22 17:29:15 UTC (rev 183110)
+++ trunk/Source/WebCore/ChangeLog        2015-04-22 17:36:44 UTC (rev 183111)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-04-22  Nan Wang  &lt;nanwang1101@yahoo.com&gt;
+
+        AX: WebKit does not expose text fields inside tree views.
+        https://bugs.webkit.org/show_bug.cgi?id=142196
+
+        Reviewed by Chris Fleizach.
+
+        The problem is that any object in a tree which is not a static text 
+        or treeitem will be ignored. Fixed it by exposing the children of treeitem.
+
+        Test: accessibility/treeitem-child-exposed.html
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::isAllowedChildOfTree):
+
</ins><span class="cx"> 2015-04-22  Xabier Rodriguez Calvar  &lt;calvaris@igalia.com&gt; and Youenn Fablet  &lt;youenn.fablet@crf.canon.fr&gt;
</span><span class="cx"> 
</span><span class="cx">         [Streams API] Implement ReadableStreamController
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (183110 => 183111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp        2015-04-22 17:29:15 UTC (rev 183110)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp        2015-04-22 17:36:44 UTC (rev 183111)
</span><span class="lines">@@ -1111,7 +1111,10 @@
</span><span class="cx">     // Determine if this is in a tree. If so, we apply special behavior to make it work like an AXOutline.
</span><span class="cx">     AccessibilityObject* axObj = parentObject();
</span><span class="cx">     bool isInTree = false;
</span><ins>+    bool isTreeItemDescendant = false;
</ins><span class="cx">     while (axObj) {
</span><ins>+        if (axObj-&gt;roleValue() == TreeItemRole)
+            isTreeItemDescendant = true;
</ins><span class="cx">         if (axObj-&gt;isTree()) {
</span><span class="cx">             isInTree = true;
</span><span class="cx">             break;
</span><span class="lines">@@ -1122,7 +1125,7 @@
</span><span class="cx">     // If the object is in a tree, only tree items should be exposed (and the children of tree items).
</span><span class="cx">     if (isInTree) {
</span><span class="cx">         AccessibilityRole role = roleValue();
</span><del>-        if (role != TreeItemRole &amp;&amp; role != StaticTextRole)
</del><ins>+        if (role != TreeItemRole &amp;&amp; role != StaticTextRole &amp;&amp; !isTreeItemDescendant)
</ins><span class="cx">             return false;
</span><span class="cx">     }
</span><span class="cx">     return true;
</span></span></pre>
</div>
</div>

</body>
</html>