<!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>[166141] 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/166141">166141</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-23 10:32:13 -0700 (Sun, 23 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: AXI: add other ARIA one-to-many relationships: owns, flowto, controls.
https://bugs.webkit.org/show_bug.cgi?id=130635
Patch by James Craig <jcraig@apple.com> on 2014-03-23
Reviewed by Timothy Hatcher.
Support for @aria-owns, @aria-controls, and @aria-flowto.
Source/WebCore:
Test: inspector-protocol/dom/getAccessibilityPropertiesForNode.html
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):
* inspector/protocol/DOM.json:
Source/WebInspectorUI:
* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Models/DOMNode.js:
* UserInterface/Views/DOMNodeDetailsSidebarPanel.js:
LayoutTests:
* 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="#trunkSourceWebInspectorUIUserInterfaceModelsDOMNodejs">trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMNodeDetailsSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166140 => 166141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-23 16:12:49 UTC (rev 166140)
+++ trunk/LayoutTests/ChangeLog 2014-03-23 17:32:13 UTC (rev 166141)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-03-23 James Craig <jcraig@apple.com>
+
+ Web Inspector: AXI: add other ARIA one-to-many relationships: owns, flowto, controls.
+ https://bugs.webkit.org/show_bug.cgi?id=130635
+
+ Reviewed by Timothy Hatcher.
+
+ Support for @aria-owns, @aria-controls, and @aria-flowto.
+
+ * inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt:
+ * inspector-protocol/dom/getAccessibilityPropertiesForNode.html:
+
</ins><span class="cx"> 2014-03-22 Chang Shu <cshu@webkit.org>
</span><span class="cx">
</span><span class="cx"> Replace deprecatedIsCollapsibleWhitespace with RenderStyle::isCollapsibleWhiteSpace in TextIterator.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocoldomgetAccessibilityPropertiesForNodeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt (166140 => 166141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt 2014-03-23 16:12:49 UTC (rev 166140)
+++ trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt 2014-03-23 17:32:13 UTC (rev 166141)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> Checking Web Inspector protocol for the Accessibility Node Inspector.
</span><span class="cx">
</span><del>-Total elements to be tested: 56.
</del><ins>+Total elements to be tested: 57.
</ins><span class="cx">
</span><span class="cx"> <li role="treeitem" aria-expanded="undefined">expanded</li>
</span><span class="cx"> exists: true
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> childNodeIds.length: 1
</span><span class="cx"> expanded: true
</span><span class="cx">
</span><del>-<ul role="tree">
</del><ins>+<ul role="tree" id="flowedTo1">
</ins><span class="cx"> <li role="treeitem" aria-expanded="true">expanded</li>
</span><span class="cx"> <li role="treeitem" aria-expanded="false">collapsed</li>
</span><span class="cx"> <li role="treeitem" aria-expanded="undefined">expanded</li>
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> role: tab
</span><span class="cx"> selected: true
</span><span class="cx">
</span><del>-<div role="tablist">
</del><ins>+<div role="tablist" aria-flowto="flowedTo1 invalidIdRef flowedTo2">
</ins><span class="cx"> <div role="tab" aria-selected="true">selected</div>
</span><span class="cx"> <div role="tab" aria-selected="false">not selected</div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> label:
</span><span class="cx"> role: tablist
</span><span class="cx"> childNodeIds.length: 2
</span><ins>+ flowedNodeIds.length: 2
</ins><span class="cx">
</span><span class="cx"> <div role="option" aria-selected="false">not selected</div>
</span><span class="cx"> exists: true
</span><span class="lines">@@ -63,7 +64,7 @@
</span><span class="cx"> role: option
</span><span class="cx"> selected: true
</span><span class="cx">
</span><del>-<div role="listbox">
</del><ins>+<div role="listbox" id="ownedlistbox">
</ins><span class="cx"> <div role="option" aria-selected="true">selected</div>
</span><span class="cx"> <div role="option" aria-selected="false">not selected</div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -73,6 +74,15 @@
</span><span class="cx"> childNodeIds.length: 2
</span><span class="cx"> required: false
</span><span class="cx">
</span><ins>+<input role="combobox" aria-owns="ownedlistbox invalidIdRef" aria-controls="ownedlistbox invalidIdRef">
+ exists: true
+ label:
+ role: combobox
+ controlledNodeIds.length: 1
+ focused: false
+ ownedNodeIds.length: 1
+ required: false
+
</ins><span class="cx"> <option>not selected</option>
</span><span class="cx"> exists: false
</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 (166140 => 166141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode.html 2014-03-23 16:12:49 UTC (rev 166140)
+++ trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode.html 2014-03-23 17:32:13 UTC (rev 166141)
</span><span class="lines">@@ -76,20 +76,23 @@
</span><span class="cx"> <img class="ex" src="data:image/gif;base64,R0lGODlhEAARAJECAOHh4UpKSgAAAAAAACH5BAEAAAIALAAAAAAQABEAAAIllB8Zx63b4otSUWcvyuz5D4biSD7AiZroWSXa5r7CJNOvra1RAQA7" alt="x" aria-hidden="true">
</span><span class="cx"> <img class="ex" src="data:image/gif;base64,R0lGODlhEAARAJECAOHh4UpKSgAAAAAAACH5BAEAAAIALAAAAAAQABEAAAIllB8Zx63b4otSUWcvyuz5D4biSD7AiZroWSXa5r7CJNOvra1RAQA7" alt="x" style="display:none;">
</span><span class="cx">
</span><del>-<select multiple>
</del><ins>+<select multiple id="flowedTo2">
</ins><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" class="ex">
</del><ins>+
+<input class="ex" role="combobox" aria-owns="ownedlistbox invalidIdRef" aria-controls="ownedlistbox invalidIdRef">
+<div role="listbox" class="ex" id="ownedlistbox">
</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" class="ex">
</del><ins>+
+<div role="tablist" class="ex" aria-flowto="flowedTo1 invalidIdRef flowedTo2">
</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" class="ex">
</del><ins>+<ul role="tree" class="ex" id="flowedTo1">
</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><span class="cx"> <li class="ex" role="treeitem" aria-expanded="undefined">expanded</li>
</span><span class="lines">@@ -152,6 +155,9 @@
</span><span class="cx"> case "parentNodeId":
</span><span class="cx"> continue;
</span><span class="cx"> case "childNodeIds":
</span><ins>+ case "controlledNodeIds":
+ case "flowedNodeIds":
+ case "ownedNodeIds":
</ins><span class="cx"> if (value.length)
</span><span class="cx"> InspectorTest.log(" " + key + ".length: " + value.length);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166140 => 166141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-23 16:12:49 UTC (rev 166140)
+++ trunk/Source/WebCore/ChangeLog 2014-03-23 17:32:13 UTC (rev 166141)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-23 James Craig <jcraig@apple.com>
+
+ Web Inspector: AXI: add other ARIA one-to-many relationships: owns, flowto, controls.
+ https://bugs.webkit.org/show_bug.cgi?id=130635
+
+ Reviewed by Timothy Hatcher.
+
+ Support for @aria-owns, @aria-controls, and @aria-flowto.
+
+ Test: inspector-protocol/dom/getAccessibilityPropertiesForNode.html
+
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):
+ * inspector/protocol/DOM.json:
+
</ins><span class="cx"> 2014-03-23 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up #includes by geometry classes
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (166140 => 166141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-03-23 16:12:49 UTC (rev 166140)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-03-23 17:32:13 UTC (rev 166141)
</span><span class="lines">@@ -1426,15 +1426,18 @@
</span><span class="cx">
</span><span class="cx"> TypeBuilder::DOM::AccessibilityProperties::Checked::Enum checked = TypeBuilder::DOM::AccessibilityProperties::Checked::False;
</span><span class="cx"> RefPtr<Inspector::TypeBuilder::Array<int>> childNodeIds;
</span><ins>+ RefPtr<Inspector::TypeBuilder::Array<int>> controlledNodeIds;
</ins><span class="cx"> bool exists = false;
</span><span class="cx"> bool expanded = false;
</span><span class="cx"> bool disabled = false;
</span><ins>+ RefPtr<Inspector::TypeBuilder::Array<int>> flowedNodeIds;
</ins><span class="cx"> bool focused = false;
</span><span class="cx"> bool ignored = true;
</span><span class="cx"> bool ignoredByDefault = false;
</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><ins>+ RefPtr<Inspector::TypeBuilder::Array<int>> ownedNodeIds;
</ins><span class="cx"> Node* parentNode = node;
</span><span class="cx"> bool pressed = false;
</span><span class="cx"> bool readonly = false;
</span><span class="lines">@@ -1470,12 +1473,32 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (axObject->supportsARIAControls()) {
+ Vector<Element*> controlledElements;
+ axObject->elementsFromAttribute(controlledElements, aria_controlsAttr);
+ if (controlledElements.size()) {
+ controlledNodeIds = Inspector::TypeBuilder::Array<int>::create();
+ for (Element* controlledElement : controlledElements)
+ controlledNodeIds->addItem(pushNodePathToFrontend(controlledElement));
+ }
+ }
+
</ins><span class="cx"> disabled = !axObject->isEnabled();
</span><span class="cx"> exists = true;
</span><span class="cx">
</span><span class="cx"> supportsExpanded = axObject->supportsARIAExpanded();
</span><span class="cx"> if (supportsExpanded)
</span><span class="cx"> expanded = axObject->isExpanded();
</span><ins>+
+ if (axObject->supportsARIAFlowTo()) {
+ Vector<Element*> flowedElements;
+ axObject->elementsFromAttribute(flowedElements, aria_flowtoAttr);
+ if (flowedElements.size()) {
+ flowedNodeIds = Inspector::TypeBuilder::Array<int>::create();
+ for (Element* flowedElement : flowedElements)
+ flowedNodeIds->addItem(pushNodePathToFrontend(flowedElement));
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> supportsFocused = toElement(node)->isFocusable();
</span><span class="cx"> if (supportsFocused)
</span><span class="lines">@@ -1497,6 +1520,16 @@
</span><span class="cx"> if (axObject->isARIAHidden() || axObject->isDOMHidden())
</span><span class="cx"> hidden = true;
</span><span class="cx">
</span><ins>+ if (axObject->supportsARIAOwns()) {
+ Vector<Element*> ownedElements;
+ axObject->elementsFromAttribute(ownedElements, aria_ownsAttr);
+ if (ownedElements.size()) {
+ ownedNodeIds = Inspector::TypeBuilder::Array<int>::create();
+ for (Element* ownedElement : ownedElements)
+ ownedNodeIds->addItem(pushNodePathToFrontend(ownedElement));
+ }
+ }
+
</ins><span class="cx"> if (AccessibilityObject* parentObject = axObject->parentObjectUnignored())
</span><span class="cx"> parentNode = parentObject->node();
</span><span class="cx">
</span><span class="lines">@@ -1527,10 +1560,14 @@
</span><span class="cx"> value->setChecked(checked);
</span><span class="cx"> if (childNodeIds)
</span><span class="cx"> value->setChildNodeIds(childNodeIds);
</span><ins>+ if (controlledNodeIds)
+ value->setControlledNodeIds(controlledNodeIds);
</ins><span class="cx"> if (disabled)
</span><span class="cx"> value->setDisabled(disabled);
</span><span class="cx"> if (supportsExpanded)
</span><span class="cx"> value->setExpanded(expanded);
</span><ins>+ if (flowedNodeIds)
+ value->setFlowedNodeIds(flowedNodeIds);
</ins><span class="cx"> if (supportsFocused)
</span><span class="cx"> value->setFocused(focused);
</span><span class="cx"> if (ignored)
</span><span class="lines">@@ -1541,6 +1578,8 @@
</span><span class="cx"> value->setInvalid(invalid);
</span><span class="cx"> if (hidden)
</span><span class="cx"> value->setHidden(hidden);
</span><ins>+ if (ownedNodeIds)
+ value->setOwnedNodeIds(ownedNodeIds);
</ins><span class="cx"> if (parentNode && parentNode != node)
</span><span class="cx"> value->setParentNodeId(pushNodePathToFrontend(parentNode));
</span><span class="cx"> if (supportsPressed)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorprotocolDOMjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/protocol/DOM.json (166140 => 166141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/protocol/DOM.json 2014-03-23 16:12:49 UTC (rev 166140)
+++ trunk/Source/WebCore/inspector/protocol/DOM.json 2014-03-23 17:32:13 UTC (rev 166141)
</span><span class="lines">@@ -62,9 +62,11 @@
</span><span class="cx"> "properties": [
</span><span class="cx"> { "name": "checked", "type": "string", "optional": true, "enum": ["true", "false", "mixed"], "description": "Checked state of certain form controls." },
</span><span class="cx"> { "name": "childNodeIds", "type": "array", "items": { "$ref": "NodeId" }, "optional": true, "description": "Array of <code>DOMNode</code> ids of the accessibility tree children if available." },
</span><ins>+ { "name": "controlledNodeIds", "type": "array", "items": { "$ref": "NodeId" }, "optional": true, "description": "Array of <code>DOMNode</code> ids of any nodes referenced via @aria-controls." },
</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><ins>+ { "name": "flowedNodeIds", "type": "array", "items": { "$ref": "NodeId" }, "optional": true, "description": "Array of <code>DOMNode</code> ids of any nodes referenced via @aria-flowto." },
</ins><span class="cx"> { "name": "focused", "type": "boolean", "optional": true, "description": "Focused state. Only defined on focusable elements." },
</span><span class="cx"> { "name": "ignored", "type": "boolean", "optional": true, "description": "Indicates whether the accessibility of the associated AX object node is ignored, whether heuristically or explicitly." },
</span><span class="cx"> { "name": "ignoredByDefault", "type": "boolean", "optional": true, "description": "State indicating whether the accessibility of the associated AX object node is ignored by default for node type." },
</span><span class="lines">@@ -72,6 +74,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": "ownedNodeIds", "type": "array", "items": { "$ref": "NodeId" }, "optional": true, "description": "Array of <code>DOMNode</code> ids of any nodes referenced via @aria-owns." },
</ins><span class="cx"> { "name": "parentNodeId", "$ref": "NodeId", "optional": true, "description": "<code>DOMNode</code> id of the accessibility tree parent object if available." },
</span><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></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (166140 => 166141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-03-23 16:12:49 UTC (rev 166140)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-03-23 17:32:13 UTC (rev 166141)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-03-23 James Craig <jcraig@apple.com>
+
+ Web Inspector: AXI: add other ARIA one-to-many relationships: owns, flowto, controls.
+ https://bugs.webkit.org/show_bug.cgi?id=130635
+
+ Reviewed by Timothy Hatcher.
+
+ Support for @aria-owns, @aria-controls, and @aria-flowto.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Models/DOMNode.js:
+ * UserInterface/Views/DOMNodeDetailsSidebarPanel.js:
+
</ins><span class="cx"> 2014-03-21 James Craig <jcraig@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: AXI: Expose Accessibility Tree children of the selected node
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (166140 => 166141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2014-03-23 16:12:49 UTC (rev 166140)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2014-03-23 17:32:13 UTC (rev 166141)
</span><span class="lines">@@ -103,6 +103,7 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " C o n t e n t F l o w " ] = " C o n t e n t F l o w " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " C o n t i n u e s c r i p t e x e c u t i o n ( % s o r % s ) " ] = " C o n t i n u e s c r i p t e x e c u t i o n ( % s o r % s ) " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " C o n t i n u e t o H e r e " ] = " C o n t i n u e t o H e r e " ;
</span><ins>+ l o c a l i z e d S t r i n g s [ " C o n t r o l s " ] = " C o n t r o l s " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " C o o k i e s " ] = " C o o k i e s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " C o p y R o w " ] = " C o p y R o w " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " C o p y a s H T M L " ] = " C o p y a s H T M L " ;
</span><span class="lines">@@ -300,6 +301,7 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " O t h e r " ] = " O t h e r " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " O t h e r I s s u e " ] = " O t h e r I s s u e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " O u t p u t : " ] = " O u t p u t : " ;
</span><ins>+ l o c a l i z e d S t r i n g s [ " O w n s " ] = " O w n s " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " P a g e I s s u e " ] = " P a g e I s s u e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " P a i n t " ] = " P a i n t " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " P a i n t s " ] = " P a i n t s " ;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsDOMNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js (166140 => 166141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js 2014-03-23 16:12:49 UTC (rev 166140)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js 2014-03-23 17:32:13 UTC (rev 166141)
</span><span class="lines">@@ -458,15 +458,18 @@
</span><span class="cx"> callback({
</span><span class="cx"> checked: accessibilityProperties.checked,
</span><span class="cx"> childNodeIds: accessibilityProperties.childNodeIds,
</span><ins>+ controlledNodeIds: accessibilityProperties.controlledNodeIds,
</ins><span class="cx"> disabled: accessibilityProperties.disabled,
</span><span class="cx"> exists: accessibilityProperties.exists,
</span><span class="cx"> expanded: accessibilityProperties.expanded,
</span><ins>+ flowedNodeIds: accessibilityProperties.flowedNodeIds,
</ins><span class="cx"> focused: accessibilityProperties.focused,
</span><span class="cx"> ignored: accessibilityProperties.ignored,
</span><span class="cx"> ignoredByDefault: accessibilityProperties.ignoredByDefault,
</span><span class="cx"> invalid: accessibilityProperties.invalid,
</span><span class="cx"> hidden: accessibilityProperties.hidden,
</span><span class="cx"> label: accessibilityProperties.label,
</span><ins>+ ownedNodeIds: accessibilityProperties.ownedNodeIds,
</ins><span class="cx"> parentNodeId: accessibilityProperties.parentNodeId,
</span><span class="cx"> pressed: accessibilityProperties.pressed,
</span><span class="cx"> readonly: accessibilityProperties.readonly,
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMNodeDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js (166140 => 166141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js 2014-03-23 16:12:49 UTC (rev 166140)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js 2014-03-23 17:32:13 UTC (rev 166141)
</span><span class="lines">@@ -60,12 +60,15 @@
</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><span class="cx"> this._accessibilityNodeChildrenRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Children"));
</span><ins>+ this._accessibilityNodeControlsRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Controls"));
</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><ins>+ this._accessibilityNodeFlowsRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Flows"));
</ins><span class="cx"> this._accessibilityNodeFocusedRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Focused"));
</span><span class="cx"> this._accessibilityNodeIgnoredRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Ignored"));
</span><span class="cx"> this._accessibilityNodeInvalidRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Invalid"));
</span><span class="cx"> this._accessibilityNodeLabelRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Label"));
</span><ins>+ this._accessibilityNodeOwnsRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Owns"));
</ins><span class="cx"> this._accessibilityNodeParentRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Parent"));
</span><span class="cx"> this._accessibilityNodePressedRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Pressed"));
</span><span class="cx"> this._accessibilityNodeReadonlyRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Readonly"));
</span><span class="lines">@@ -272,6 +275,28 @@
</span><span class="cx"> return "";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function linkListForNodeIds(nodeIds) {
+ var hasLinks = false;
+ var linkList = null;
+ if (nodeIds !== undefined) {
+ linkList = document.createElement("ul");
+ linkList.className = "node-link-list";
+ for (var nodeId of nodeIds) {
+ var node = WebInspector.domTreeManager.nodeForId(nodeId);
+ if (node) {
+ var link = WebInspector.linkifyAccessibilityNodeReference(node);
+ if (link) {
+ hasLinks = true;
+ var listitem = document.createElement("li");
+ listitem.appendChild(link);
+ linkList.appendChild(listitem);
+ }
+ }
+ }
+ }
+ return hasLinks ? linkList : null;
+ }
+
</ins><span class="cx"> function accessibilityPropertiesCallback(accessibilityProperties) {
</span><span class="cx"> if (this.domNode !== domNode)
</span><span class="cx"> return;
</span><span class="lines">@@ -292,31 +317,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Accessibility tree children are not a 1:1 mapping with DOM tree children.
</span><del>- 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);
- }
- }
- }
-
</del><ins>+ var childNodeLinkList = linkListForNodeIds(accessibilityProperties.childNodeIds);
+
+ var controlledNodeLinkList = linkListForNodeIds(accessibilityProperties.controlledNodeIds);
</ins><span class="cx"> var disabled = booleanValueToLocalizedStringIfTrue("disabled");
</span><span class="cx"> var expanded = booleanValueToLocalizedStringIfPropertyDefined("expanded");
</span><ins>+ var flowedNodeLinkList = linkListForNodeIds(accessibilityProperties.flowedNodeIds);
</ins><span class="cx"> var focused = booleanValueToLocalizedStringIfPropertyDefined("focused");
</span><span class="cx">
</span><span class="cx"> var ignored = "";
</span><span class="lines">@@ -341,6 +347,8 @@
</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>+ var ownedNodeLinkList = linkListForNodeIds(accessibilityProperties.ownedNodeIds);
+
</ins><span class="cx"> // Accessibility tree parent is not a 1:1 mapping with the DOM tree parent.
</span><span class="cx"> var parentNodeLink = null;
</span><span class="cx"> if (accessibilityProperties.parentNodeId !== undefined) {
</span><span class="lines">@@ -367,12 +375,15 @@
</span><span class="cx"> // Assign all the properties to their respective views.
</span><span class="cx"> this._accessibilityNodeCheckedRow.value = checked;
</span><span class="cx"> this._accessibilityNodeChildrenRow.value = childNodeLinkList || "";
</span><ins>+ this._accessibilityNodeControlsRow.value = controlledNodeLinkList || "";
</ins><span class="cx"> this._accessibilityNodeDisabledRow.value = disabled;
</span><span class="cx"> this._accessibilityNodeExpandedRow.value = expanded;
</span><ins>+ this._accessibilityNodeFlowsRow.value = flowedNodeLinkList || "";
</ins><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><ins>+ this._accessibilityNodeOwnsRow.value = ownedNodeLinkList || "";
</ins><span class="cx"> this._accessibilityNodeParentRow.value = parentNodeLink || "";
</span><span class="cx"> this._accessibilityNodePressedRow.value = pressed;
</span><span class="cx"> this._accessibilityNodeReadonlyRow.value = readonly;
</span><span class="lines">@@ -388,6 +399,9 @@
</span><span class="cx"> this._accessibilityNodeLabelRow,
</span><span class="cx"> this._accessibilityNodeParentRow,
</span><span class="cx"> this._accessibilityNodeChildrenRow,
</span><ins>+ this._accessibilityNodeOwnsRow,
+ this._accessibilityNodeControlsRow,
+ this._accessibilityNodeFlowsRow,
</ins><span class="cx"> this._accessibilityNodeFocusedRow,
</span><span class="cx">
</span><span class="cx"> // Properties exposed for all input-type elements.
</span></span></pre>
</div>
</div>
</body>
</html>