<!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>[166087] 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/166087">166087</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-21 12:08:13 -0700 (Fri, 21 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: AXI: Expose Accessibility Tree children of the selected node
https://bugs.webkit.org/show_bug.cgi?id=130264
Patch by James Craig <jcraig@apple.com> on 2014-03-21
Reviewed by Timothy Hatcher.
Source/WebCore:
Test: inspector-protocol/dom/getAccessibilityPropertiesForNode.html
Expose the accessibility tree children (different from DOM children) of the
current node in the accessibility node inspector.
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):
* inspector/InspectorDOMAgent.h:
* inspector/protocol/DOM.json:
Source/WebInspectorUI:
Expose the accessibility tree children (different from DOM children) of the
current node in the accessibility node inspector.
* Localizations/en.lproj/localizedStrings.js: New "Children" string.
* UserInterface/Base/DOMUtilities.js: Added linkifyAccessibilityNodeReference.
* UserInterface/Models/DOMNode.js: Support for accessibility children.
* UserInterface/Views/DOMNodeDetailsSidebarPanel.js: Support for accessibility children.
* UserInterface/Views/Main.css: New styles for .node-link-list.
LayoutTests:
Updating for support of accessibility tree children.
* inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt:
* inspector-protocol/dom/getAccessibilityPropertiesForNode.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocoldomgetAccessibilityPropertiesForNodeexpectedtxt">trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocoldomgetAccessibilityPropertiesForNodehtml">trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorprotocolDOMjson">trunk/Source/WebCore/inspector/protocol/DOM.json</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseDOMUtilitiesjs">trunk/Source/WebInspectorUI/UserInterface/Base/DOMUtilities.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsDOMNodejs">trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMNodeDetailsSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsMaincss">trunk/Source/WebInspectorUI/UserInterface/Views/Main.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166086 => 166087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-21 19:05:48 UTC (rev 166086)
+++ trunk/LayoutTests/ChangeLog 2014-03-21 19:08:13 UTC (rev 166087)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-03-21 James Craig <jcraig@apple.com>
+
+ Web Inspector: AXI: Expose Accessibility Tree children of the selected node
+ https://bugs.webkit.org/show_bug.cgi?id=130264
+
+ Reviewed by Timothy Hatcher.
+
+ Updating for support of accessibility tree children.
+
+ * inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt:
+ * inspector-protocol/dom/getAccessibilityPropertiesForNode.html:
+
</ins><span class="cx"> 2014-03-21 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed WebKitGtk+ rebaseline.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocoldomgetAccessibilityPropertiesForNodeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt (166086 => 166087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt 2014-03-21 19:05:48 UTC (rev 166086)
+++ trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt 2014-03-21 19:08:13 UTC (rev 166087)
</span><span class="lines">@@ -1,19 +1,37 @@
</span><span class="cx"> Checking Web Inspector protocol for the Accessibility Node Inspector.
</span><span class="cx">
</span><del>-Total elements to be tested: 51.
</del><ins>+Total elements to be tested: 56.
</ins><span class="cx">
</span><ins>+<li role="treeitem" aria-expanded="undefined">expanded</li>
+ exists: true
+ label:
+ role: treeitem
+ childNodeIds.length: 1
+
</ins><span class="cx"> <li role="treeitem" aria-expanded="false">collapsed</li>
</span><span class="cx"> exists: true
</span><span class="cx"> label:
</span><span class="cx"> role: treeitem
</span><ins>+ childNodeIds.length: 1
</ins><span class="cx"> expanded: false
</span><span class="cx">
</span><span class="cx"> <li role="treeitem" aria-expanded="true">expanded</li>
</span><span class="cx"> exists: true
</span><span class="cx"> label:
</span><span class="cx"> role: treeitem
</span><ins>+ childNodeIds.length: 1
</ins><span class="cx"> expanded: true
</span><span class="cx">
</span><ins>+<ul role="tree">
+ <li role="treeitem" aria-expanded="true">expanded</li>
+ <li role="treeitem" aria-expanded="false">collapsed</li>
+ <li role="treeitem" aria-expanded="undefined">expanded</li>
+</ul>
+ exists: true
+ label:
+ role: tree
+ childNodeIds.length: 3
+
</ins><span class="cx"> <div role="tab" aria-selected="false">not selected</div>
</span><span class="cx"> exists: true
</span><span class="cx"> label:
</span><span class="lines">@@ -25,6 +43,15 @@
</span><span class="cx"> role: tab
</span><span class="cx"> selected: true
</span><span class="cx">
</span><ins>+<div role="tablist">
+ <div role="tab" aria-selected="true">selected</div>
+ <div role="tab" aria-selected="false">not selected</div>
+</div>
+ exists: true
+ label:
+ role: tablist
+ childNodeIds.length: 2
+
</ins><span class="cx"> <div role="option" aria-selected="false">not selected</div>
</span><span class="cx"> exists: true
</span><span class="cx"> label:
</span><span class="lines">@@ -36,6 +63,16 @@
</span><span class="cx"> role: option
</span><span class="cx"> selected: true
</span><span class="cx">
</span><ins>+<div role="listbox">
+ <div role="option" aria-selected="true">selected</div>
+ <div role="option" aria-selected="false">not selected</div>
+</div>
+ exists: true
+ label:
+ role: listbox
+ childNodeIds.length: 2
+ required: false
+
</ins><span class="cx"> <option>not selected</option>
</span><span class="cx"> exists: false
</span><span class="cx"> label:
</span><span class="lines">@@ -197,6 +234,7 @@
</span><span class="cx"> exists: true
</span><span class="cx"> label:
</span><span class="cx"> role:
</span><ins>+ childNodeIds.length: 1
</ins><span class="cx"> disabled: true
</span><span class="cx"> required: false
</span><span class="cx">
</span><span class="lines">@@ -212,6 +250,7 @@
</span><span class="cx"> exists: true
</span><span class="cx"> label:
</span><span class="cx"> role:
</span><ins>+ childNodeIds.length: 1
</ins><span class="cx"> focused: false
</span><span class="cx"> readonly: true
</span><span class="cx"> required: false
</span><span class="lines">@@ -220,6 +259,7 @@
</span><span class="cx"> exists: true
</span><span class="cx"> label:
</span><span class="cx"> role:
</span><ins>+ childNodeIds.length: 1
</ins><span class="cx"> focused: false
</span><span class="cx"> invalid: true
</span><span class="cx"> required: false
</span><span class="lines">@@ -228,6 +268,7 @@
</span><span class="cx"> exists: true
</span><span class="cx"> label:
</span><span class="cx"> role:
</span><ins>+ childNodeIds.length: 1
</ins><span class="cx"> focused: false
</span><span class="cx"> invalid: spelling
</span><span class="cx"> required: false
</span><span class="lines">@@ -236,6 +277,7 @@
</span><span class="cx"> exists: true
</span><span class="cx"> label:
</span><span class="cx"> role:
</span><ins>+ childNodeIds.length: 1
</ins><span class="cx"> focused: false
</span><span class="cx"> required: true
</span><span class="cx">
</span><span class="lines">@@ -329,6 +371,21 @@
</span><span class="cx"> role: presentation
</span><span class="cx"> ignored: true
</span><span class="cx">
</span><ins>+<div role="group">
+ <!-- FIXME: childNodeIds.length should be 3 (foo, bar, baz). WebCore only reports 1 (foo). http://webkit.org/b/130563 -->
+ <div>foo</div>
+ <span>
+ bar
+ <span role="button">baz</span>
+ </span>
+ <div></div>
+ <div></div>
+</div>
+ exists: true
+ label:
+ role: group
+ childNodeIds.length: 1
+
</ins><span class="cx"> <div><div></div></div>
</span><span class="cx"> exists: true
</span><span class="cx"> label:
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocoldomgetAccessibilityPropertiesForNodehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode.html (166086 => 166087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode.html 2014-03-21 19:05:48 UTC (rev 166086)
+++ trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode.html 2014-03-21 19:08:13 UTC (rev 166087)
</span><span class="lines">@@ -12,6 +12,18 @@
</span><span class="cx"> <script class="ex" style="display:block;"></script>
</span><span class="cx">
</span><span class="cx"> <div class="ex"><div></div></div>
</span><ins>+
+<div role="group" class="ex">
+ <!-- FIXME: childNodeIds.length should be 3 (foo, bar, baz). WebCore only reports 1 (foo). http://webkit.org/b/130563 -->
+ <div>foo</div>
+ <span>
+ bar
+ <span role="button">baz</span>
+ </span>
+ <div></div>
+ <div></div>
+</div>
+
</ins><span class="cx"> <div class="ex" role="presentation"><div></div></div>
</span><span class="cx"> <div class="ex"></div>
</span><span class="cx"> <div class="ex" aria-hidden="true"></div>
</span><span class="lines">@@ -25,13 +37,16 @@
</span><span class="cx"> <button class="ex"></button>
</span><span class="cx"> <input class="ex" type="button">
</span><span class="cx">
</span><del>-<!-- FIXME: Inputs missing axParentNodeId http://webkit.org/b/130181 -->
</del><ins>+<!-- FIXME: Inputs missing parentNodeId http://webkit.org/b/130181 -->
</ins><span class="cx"> <input class="ex">
</span><span class="cx"> <input class="ex" required>
</span><ins>+
+<!-- Note: These correctly report childNodeIds.length of 1 b/c of their shadow DOM tree. See http://webkit.org/b/130302 -->
</ins><span class="cx"> <input class="ex" aria-required="true" value="required">
</span><span class="cx"> <input class="ex" aria-invalid="spelling" value="invalid spelling">
</span><span class="cx"> <input class="ex" aria-invalid="foo" value="fake value will eval to true">
</span><span class="cx"> <input class="ex" readonly value="readonly">
</span><ins>+
</ins><span class="cx"> <div class="ex" role="textbox" tabindex="0" aria-readonly="true">readonly</div>
</span><span class="cx"> <input class="ex" disabled value="disabled">
</span><span class="cx"> <div class="ex" role="textbox" tabindex="0" aria-disabled="true">disabled</div>
</span><span class="lines">@@ -53,7 +68,7 @@
</span><span class="cx"> <input class="ex" aria-hidden="true">
</span><span class="cx"> <input class="ex" style="display:none;">
</span><span class="cx">
</span><del>-<!-- FIXME: Images missing axParentNodeId http://webkit.org/b/130181 -->
</del><ins>+<!-- FIXME: Images missing parentNodeId http://webkit.org/b/130181 -->
</ins><span class="cx"> <img class="ex" src="./404.gif"><!-- img:not([alt]) ignored if it does not load. -->
</span><span class="cx"> <img class="ex" src="data:image/gif;base64,R0lGODlhEAARAJECAOHh4UpKSgAAAAAAACH5BAEAAAIALAAAAAAQABEAAAIllB8Zx63b4otSUWcvyuz5D4biSD7AiZroWSXa5r7CJNOvra1RAQA7">
</span><span class="cx"> <img class="ex" src="data:image/gif;base64,R0lGODlhEAARAJECAOHh4UpKSgAAAAAAACH5BAEAAAIALAAAAAAQABEAAAIllB8Zx63b4otSUWcvyuz5D4biSD7AiZroWSXa5r7CJNOvra1RAQA7" alt="">
</span><span class="lines">@@ -65,18 +80,19 @@
</span><span class="cx"> <option class="ex" selected>FIXME: Selected is false. Expected true. http://webkit.org/b/129835</option>
</span><span class="cx"> <option class="ex">not selected</option>
</span><span class="cx"> </select>
</span><del>-<div role="listbox">
</del><ins>+<div role="listbox" class="ex">
</ins><span class="cx"> <div class="ex" role="option" aria-selected="true">selected</div>
</span><span class="cx"> <div class="ex" role="option" aria-selected="false">not selected</div>
</span><span class="cx"> </div>
</span><del>-<div role="tablist">
</del><ins>+<div role="tablist" class="ex">
</ins><span class="cx"> <div class="ex" role="tab" aria-selected="true">selected</div>
</span><span class="cx"> <div class="ex" role="tab" aria-selected="false">not selected</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<ul role="tree">
</del><ins>+<ul role="tree" class="ex">
</ins><span class="cx"> <li class="ex" role="treeitem" aria-expanded="true">expanded</li>
</span><span class="cx"> <li class="ex" role="treeitem" aria-expanded="false">collapsed</li>
</span><ins>+ <li class="ex" role="treeitem" aria-expanded="undefined">expanded</li>
</ins><span class="cx"> </ul>
</span><span class="cx">
</span><span class="cx"> </div>
</span><span class="lines">@@ -121,7 +137,7 @@
</span><span class="cx"> function onGotOuterHTML(response) {
</span><span class="cx"> InspectorTest.checkForError(response);
</span><span class="cx"> var outerHTML = response.result.outerHTML;
</span><del>- outerHTML = outerHTML.replace(" class=\"ex\"", ""); // remove any duplicated, unnecessary class attributes
</del><ins>+ outerHTML = outerHTML.replace(/ class="ex"/g, ""); // remove any duplicated, unnecessary class attributes
</ins><span class="cx"> outerHTML = outerHTML.replace(/;base64,.*?"/, "...\""); // suppress full data URIs in output
</span><span class="cx"> InspectorTest.log("\n" + outerHTML);
</span><span class="cx"> InspectorTest.sendCommand("DOM.getAccessibilityPropertiesForNode", {"nodeId": examples[examples.length-1]}, onGotAXProps);
</span><span class="lines">@@ -131,9 +147,17 @@
</span><span class="cx"> InspectorTest.checkForError(response);
</span><span class="cx"> for (var key in response.result.properties) {
</span><span class="cx"> var value = response.result.properties[key];
</span><del>- if (key === "nodeId" || key === "axParentNodeId")
</del><ins>+ switch (key){
+ case "nodeId":
+ case "parentNodeId":
</ins><span class="cx"> continue;
</span><del>- InspectorTest.log(" " + key + ": " + value);
</del><ins>+ case "childNodeIds":
+ if (value.length)
+ InspectorTest.log(" " + key + ".length: " + value.length);
+ break;
+ default:
+ InspectorTest.log(" " + key + ": " + value);
+ }
</ins><span class="cx"> }
</span><span class="cx"> examples.pop();
</span><span class="cx"> loop();
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166086 => 166087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-21 19:05:48 UTC (rev 166086)
+++ trunk/Source/WebCore/ChangeLog 2014-03-21 19:08:13 UTC (rev 166087)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-03-21 James Craig <jcraig@apple.com>
+
+ Web Inspector: AXI: Expose Accessibility Tree children of the selected node
+ https://bugs.webkit.org/show_bug.cgi?id=130264
+
+ Reviewed by Timothy Hatcher.
+
+ Test: inspector-protocol/dom/getAccessibilityPropertiesForNode.html
+
+ Expose the accessibility tree children (different from DOM children) of the
+ current node in the accessibility node inspector.
+
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):
+ * inspector/InspectorDOMAgent.h:
+ * inspector/protocol/DOM.json:
+
</ins><span class="cx"> 2014-03-21 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Win] Compile fixes with video not enabled.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (166086 => 166087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-03-21 19:05:48 UTC (rev 166086)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-03-21 19:08:13 UTC (rev 166087)
</span><span class="lines">@@ -1425,6 +1425,7 @@
</span><span class="cx"> WebCore::AXObjectCache::enableAccessibility();
</span><span class="cx">
</span><span class="cx"> TypeBuilder::DOM::AccessibilityProperties::Checked::Enum checked = TypeBuilder::DOM::AccessibilityProperties::Checked::False;
</span><ins>+ RefPtr<Inspector::TypeBuilder::Array<int>> childNodeIds;
</ins><span class="cx"> bool exists = false;
</span><span class="cx"> bool expanded = false;
</span><span class="cx"> bool disabled = false;
</span><span class="lines">@@ -1434,7 +1435,7 @@
</span><span class="cx"> TypeBuilder::DOM::AccessibilityProperties::Invalid::Enum invalid = TypeBuilder::DOM::AccessibilityProperties::Invalid::False;
</span><span class="cx"> bool hidden = false;
</span><span class="cx"> String label; // FIXME: Waiting on http://webkit.org/b/121134
</span><del>- Node* axParentNode = node;
</del><ins>+ Node* parentNode = node;
</ins><span class="cx"> bool pressed = false;
</span><span class="cx"> bool readonly = false;
</span><span class="cx"> bool required = false;
</span><span class="lines">@@ -1449,9 +1450,6 @@
</span><span class="cx"> if (AXObjectCache* axObjectCache = node->document().axObjectCache()) {
</span><span class="cx"> if (AccessibilityObject* axObject = axObjectCache->getOrCreate(node)) {
</span><span class="cx">
</span><del>- if (AccessibilityObject* parentObject = axObject->parentObjectUnignored())
- axParentNode = parentObject->node();
-
</del><span class="cx"> supportsChecked = axObject->supportsChecked();
</span><span class="cx"> if (supportsChecked) {
</span><span class="cx"> int checkValue = axObject->checkboxOrRadioValue(); // Element using aria-checked.
</span><span class="lines">@@ -1463,6 +1461,15 @@
</span><span class="cx"> checked = TypeBuilder::DOM::AccessibilityProperties::Checked::True;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ const auto& children = axObject->children();
+ if (children.size()) {
+ childNodeIds = Inspector::TypeBuilder::Array<int>::create();
+ for (const auto& childObject : children) {
+ if (Node* childNode = childObject->node())
+ childNodeIds->addItem(pushNodePathToFrontend(childNode));
+ }
+ }
+
</ins><span class="cx"> disabled = !axObject->isEnabled();
</span><span class="cx"> exists = true;
</span><span class="cx">
</span><span class="lines">@@ -1490,6 +1497,9 @@
</span><span class="cx"> if (axObject->isARIAHidden() || axObject->isDOMHidden())
</span><span class="cx"> hidden = true;
</span><span class="cx">
</span><ins>+ if (AccessibilityObject* parentObject = axObject->parentObjectUnignored())
+ parentNode = parentObject->node();
+
</ins><span class="cx"> supportsPressed = axObject->ariaPressedIsPresent();
</span><span class="cx"> if (supportsPressed)
</span><span class="cx"> pressed = axObject->isPressed();
</span><span class="lines">@@ -1513,10 +1523,10 @@
</span><span class="cx"> .setNodeId(pushNodePathToFrontend(node));
</span><span class="cx">
</span><span class="cx"> if (exists) {
</span><del>- if (axParentNode && axParentNode != node)
- value->setAxParentNodeId(pushNodePathToFrontend(axParentNode));
</del><span class="cx"> if (supportsChecked)
</span><span class="cx"> value->setChecked(checked);
</span><ins>+ if (childNodeIds)
+ value->setChildNodeIds(childNodeIds);
</ins><span class="cx"> if (disabled)
</span><span class="cx"> value->setDisabled(disabled);
</span><span class="cx"> if (supportsExpanded)
</span><span class="lines">@@ -1531,6 +1541,8 @@
</span><span class="cx"> value->setInvalid(invalid);
</span><span class="cx"> if (hidden)
</span><span class="cx"> value->setHidden(hidden);
</span><ins>+ if (parentNode && parentNode != node)
+ value->setParentNodeId(pushNodePathToFrontend(parentNode));
</ins><span class="cx"> if (supportsPressed)
</span><span class="cx"> value->setPressed(pressed);
</span><span class="cx"> if (readonly)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorprotocolDOMjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/protocol/DOM.json (166086 => 166087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/protocol/DOM.json 2014-03-21 19:05:48 UTC (rev 166086)
+++ trunk/Source/WebCore/inspector/protocol/DOM.json 2014-03-21 19:08:13 UTC (rev 166087)
</span><span class="lines">@@ -60,8 +60,8 @@
</span><span class="cx"> "description": "A structure holding accessibility properties.",
</span><span class="cx"> "type": "object",
</span><span class="cx"> "properties": [
</span><del>- { "name": "axParentNodeId", "$ref": "NodeId", "optional": true, "description": "<code>DOMNode</code> id of the accessibility tree parent object if available." },
</del><span class="cx"> { "name": "checked", "type": "string", "optional": true, "enum": ["true", "false", "mixed"], "description": "Checked state of certain form controls." },
</span><ins>+ { "name": "childNodeIds", "type": "array", "items": { "$ref": "NodeId" }, "optional": true, "description": "Array of <code>DOMNode</code> ids of the accessibility tree children if available." },
</ins><span class="cx"> { "name": "disabled", "type": "boolean", "optional": true, "description": "Disabled state of form controls." },
</span><span class="cx"> { "name": "exists", "type": "boolean", "description": "Indicates whether there is an existing AX object for the DOM node. If this is false, all the other properties will be default values." },
</span><span class="cx"> { "name": "expanded", "type": "boolean", "optional": true, "description": "Expanded state." },
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> { "name": "hidden", "type": "boolean", "optional": true, "description": "Hidden state. True if node or an ancestor is hidden via CSS or explicit @aria-hidden, to clarify why the element is ignored." },
</span><span class="cx"> { "name": "label", "type": "string", "description": "Computed label value for the node, sometimes calculated by referencing other nodes." },
</span><span class="cx"> { "name": "nodeId", "$ref": "NodeId", "description": "Target <code>DOMNode</code> id." },
</span><ins>+ { "name": "parentNodeId", "$ref": "NodeId", "optional": true, "description": "<code>DOMNode</code> id of the accessibility tree parent object if available." },
</ins><span class="cx"> { "name": "pressed", "type": "boolean", "optional": true, "description": "Pressed state for toggle buttons." },
</span><span class="cx"> { "name": "readonly", "type": "boolean", "optional": true, "description": "Readonly state of text controls." },
</span><span class="cx"> { "name": "required", "type": "boolean", "optional": true, "description": "Required state of form controls." },
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (166086 => 166087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-03-21 19:05:48 UTC (rev 166086)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-03-21 19:08:13 UTC (rev 166087)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-03-21 James Craig <jcraig@apple.com>
+
+ Web Inspector: AXI: Expose Accessibility Tree children of the selected node
+ https://bugs.webkit.org/show_bug.cgi?id=130264
+
+ Reviewed by Timothy Hatcher.
+
+ Expose the accessibility tree children (different from DOM children) of the
+ current node in the accessibility node inspector.
+
+ * Localizations/en.lproj/localizedStrings.js: New "Children" string.
+ * UserInterface/Base/DOMUtilities.js: Added linkifyAccessibilityNodeReference.
+ * UserInterface/Models/DOMNode.js: Support for accessibility children.
+ * UserInterface/Views/DOMNodeDetailsSidebarPanel.js: Support for accessibility children.
+ * UserInterface/Views/Main.css: New styles for .node-link-list.
+
</ins><span class="cx"> 2014-03-20 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: add temporary buttons to capture/play/pause replay recordings
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (166086 => 166087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2014-03-21 19:05:48 UTC (rev 166086)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2014-03-21 19:08:13 UTC (rev 166087)
</span><span class="lines">@@ -78,6 +78,7 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " C h a r a c t e r D a t a " ] = " C h a r a c t e r D a t a " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " C h e c k e d " ] = " C h e c k e d " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " C h i l d L a y e r s " ] = " C h i l d L a y e r s " ;
</span><ins>+ l o c a l i z e d S t r i n g s [ " C h i l d r e n " ] = " C h i l d r e n " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " C l e a r L o g " ] = " C l e a r L o g " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " C l e a r T i m e l i n e " ] = " C l e a r T i m e l i n e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " C l e a r l o g ( % s o r % s ) " ] = " C l e a r l o g ( % s o r % s ) " ;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseDOMUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/DOMUtilities.js (166086 => 166087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/DOMUtilities.js 2014-03-21 19:05:48 UTC (rev 166086)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/DOMUtilities.js 2014-03-21 19:08:13 UTC (rev 166087)
</span><span class="lines">@@ -70,6 +70,23 @@
</span><span class="cx"> return title;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WebInspector.linkifyAccessibilityNodeReference = function(node)
+{
+ if (!node)
+ return null;
+ // Same as linkifyNodeReference except the link text has the classnames removed...
+ // ...for list brevity, and both text and title have roleSelectorForNode appended.
+ var link = WebInspector.linkifyNodeReference(node);
+ var tagIdSelector = link.title;
+ var classSelectorIndex = tagIdSelector.indexOf(".");
+ if (classSelectorIndex > -1)
+ tagIdSelector = tagIdSelector.substring(0, classSelectorIndex);
+ var roleSelector = WebInspector.roleSelectorForNode(node);
+ link.textContent = tagIdSelector + roleSelector;
+ link.title += roleSelector;
+ return link;
+}
+
</ins><span class="cx"> WebInspector.linkifyNodeReference = function(node)
</span><span class="cx"> {
</span><span class="cx"> var displayName = WebInspector.displayNameForNode(node);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsDOMNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js (166086 => 166087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js 2014-03-21 19:05:48 UTC (rev 166086)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js 2014-03-21 19:08:13 UTC (rev 166087)
</span><span class="lines">@@ -456,8 +456,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (!error && callback && accessibilityProperties) {
</span><span class="cx"> callback({
</span><del>- axParentNodeId: accessibilityProperties.axParentNodeId,
</del><span class="cx"> checked: accessibilityProperties.checked,
</span><ins>+ childNodeIds: accessibilityProperties.childNodeIds,
</ins><span class="cx"> disabled: accessibilityProperties.disabled,
</span><span class="cx"> exists: accessibilityProperties.exists,
</span><span class="cx"> expanded: accessibilityProperties.expanded,
</span><span class="lines">@@ -467,6 +467,7 @@
</span><span class="cx"> invalid: accessibilityProperties.invalid,
</span><span class="cx"> hidden: accessibilityProperties.hidden,
</span><span class="cx"> label: accessibilityProperties.label,
</span><ins>+ parentNodeId: accessibilityProperties.parentNodeId,
</ins><span class="cx"> pressed: accessibilityProperties.pressed,
</span><span class="cx"> readonly: accessibilityProperties.readonly,
</span><span class="cx"> required: accessibilityProperties.required,
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMNodeDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js (166086 => 166087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js 2014-03-21 19:05:48 UTC (rev 166086)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js 2014-03-21 19:08:13 UTC (rev 166087)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> if (this._accessibilitySupported()) {
</span><span class="cx"> this._accessibilityEmptyRow = new WebInspector.DetailsSectionRow(WebInspector.UIString("No Accessibility Information"));
</span><span class="cx"> this._accessibilityNodeCheckedRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Checked"));
</span><ins>+ this._accessibilityNodeChildrenRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Children"));
</ins><span class="cx"> this._accessibilityNodeDisabledRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Disabled"));
</span><span class="cx"> this._accessibilityNodeExpandedRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Expanded"));
</span><span class="cx"> this._accessibilityNodeFocusedRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Focused"));
</span><span class="lines">@@ -280,14 +281,6 @@
</span><span class="cx">
</span><span class="cx"> if (accessibilityProperties && accessibilityProperties.exists) {
</span><span class="cx">
</span><del>- var axParentNodeLink = null;
- if (accessibilityProperties.axParentNodeId !== undefined) {
- var axParentNode = WebInspector.domTreeManager.nodeForId(accessibilityProperties.axParentNodeId);
- axParentNodeLink = WebInspector.linkifyNodeReference(axParentNode);
- axParentNodeLink.title += WebInspector.roleSelectorForNode(axParentNode);
- axParentNodeLink.textContent = axParentNode.computedRole() || axParentNodeLink.title;
- }
-
</del><span class="cx"> var checked = "";
</span><span class="cx"> if (accessibilityProperties.checked !== undefined) {
</span><span class="cx"> if (accessibilityProperties.checked === DOMAgent.AccessibilityPropertiesChecked.True)
</span><span class="lines">@@ -298,6 +291,30 @@
</span><span class="cx"> checked = WebInspector.UIString("No");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Accessibility tree children are not a 1:1 mapping with DOM tree children.
+ var childNodeLinks = [];
+ var childNodeLinkList = null;
+ if (accessibilityProperties.childNodeIds !== undefined) {
+ var childNodes = accessibilityProperties.childNodeIds;
+ for (var childNodeId of childNodes) {
+ var childNode = WebInspector.domTreeManager.nodeForId(childNodeId);
+ if (childNode) {
+ var childNodeLink = WebInspector.linkifyAccessibilityNodeReference(childNode);
+ if (childNodeLink)
+ childNodeLinks.push(childNodeLink);
+ }
+ }
+ if (childNodeLinks.length) {
+ childNodeLinkList = document.createElement("ul");
+ childNodeLinkList.className = "node-link-list";
+ for (var childNodeLink of childNodeLinks) {
+ var listitem = document.createElement("li");
+ listitem.appendChild(childNodeLink);
+ childNodeLinkList.appendChild(listitem);
+ }
+ }
+ }
+
</ins><span class="cx"> var disabled = booleanValueToLocalizedStringIfTrue("disabled");
</span><span class="cx"> var expanded = booleanValueToLocalizedStringIfPropertyDefined("expanded");
</span><span class="cx"> var focused = booleanValueToLocalizedStringIfPropertyDefined("focused");
</span><span class="lines">@@ -324,6 +341,13 @@
</span><span class="cx"> if (label && label !== domNode.getAttribute("aria-label"))
</span><span class="cx"> label = WebInspector.UIString("%s (computed)").format(label);
</span><span class="cx">
</span><ins>+ // Accessibility tree parent is not a 1:1 mapping with the DOM tree parent.
+ var parentNodeLink = null;
+ if (accessibilityProperties.parentNodeId !== undefined) {
+ var parentNode = WebInspector.domTreeManager.nodeForId(accessibilityProperties.parentNodeId);
+ parentNodeLink = WebInspector.linkifyAccessibilityNodeReference(parentNode);
+ }
+
</ins><span class="cx"> var pressed = booleanValueToLocalizedStringIfPropertyDefined("pressed");
</span><span class="cx"> var readonly = booleanValueToLocalizedStringIfTrue("readonly");
</span><span class="cx"> var required = booleanValueToLocalizedStringIfPropertyDefined("required");
</span><span class="lines">@@ -342,13 +366,14 @@
</span><span class="cx">
</span><span class="cx"> // Assign all the properties to their respective views.
</span><span class="cx"> this._accessibilityNodeCheckedRow.value = checked;
</span><ins>+ this._accessibilityNodeChildrenRow.value = childNodeLinkList || "";
</ins><span class="cx"> this._accessibilityNodeDisabledRow.value = disabled;
</span><span class="cx"> this._accessibilityNodeExpandedRow.value = expanded;
</span><span class="cx"> this._accessibilityNodeFocusedRow.value = focused;
</span><span class="cx"> this._accessibilityNodeIgnoredRow.value = ignored;
</span><span class="cx"> this._accessibilityNodeInvalidRow.value = invalid;
</span><span class="cx"> this._accessibilityNodeLabelRow.value = label;
</span><del>- this._accessibilityNodeParentRow.value = axParentNodeLink || "";
</del><ins>+ this._accessibilityNodeParentRow.value = parentNodeLink || "";
</ins><span class="cx"> this._accessibilityNodePressedRow.value = pressed;
</span><span class="cx"> this._accessibilityNodeReadonlyRow.value = readonly;
</span><span class="cx"> this._accessibilityNodeRequiredRow.value = required;
</span><span class="lines">@@ -358,11 +383,12 @@
</span><span class="cx"> // Display order, not alphabetical as above.
</span><span class="cx"> this._accessibilityGroup.rows = [
</span><span class="cx"> // Global properties for all elements.
</span><del>- this._accessibilityNodeFocusedRow,
</del><span class="cx"> this._accessibilityNodeIgnoredRow,
</span><span class="cx"> this._accessibilityNodeRoleRow,
</span><span class="cx"> this._accessibilityNodeLabelRow,
</span><span class="cx"> this._accessibilityNodeParentRow,
</span><ins>+ this._accessibilityNodeChildrenRow,
+ this._accessibilityNodeFocusedRow,
</ins><span class="cx">
</span><span class="cx"> // Properties exposed for all input-type elements.
</span><span class="cx"> this._accessibilityNodeDisabledRow,
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsMaincss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Main.css (166086 => 166087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/Main.css 2014-03-21 19:05:48 UTC (rev 166086)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Main.css 2014-03-21 19:08:13 UTC (rev 166087)
</span><span class="lines">@@ -255,3 +255,18 @@
</span><span class="cx"> text-decoration: underline;
</span><span class="cx"> cursor: pointer;
</span><span class="cx"> }
</span><ins>+
+.node-link-list, .node-link-list li {
+ display: block;
+ margin: 0;
+ padding: 0;
+ line-height: 1.2;
+}
+
+.node-link-list li {
+ margin: 0 0 0.4em;
+}
+
+.node-link-list li:last-child {
+ margin: 0;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>