<!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>[189642] 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/189642">189642</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-11 17:47:20 -0700 (Fri, 11 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: ARIA 1.1 @aria-current
https://bugs.webkit.org/show_bug.cgi?id=146012
Patch by Nan Wang <n_wang@apple.com> on 2015-09-11
Reviewed by Chris Fleizach.
Source/JavaScriptCore:
Updated inspector to support aria-current.
* inspector/protocol/DOM.json:
Source/WebCore:
Tests: accessibility/aria-current.html
inspector/dom/getAccessibilityPropertiesForNode_ariaCurrent.html
Added support for ARIA 1.1 aria-current.
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::invalidStatus):
(WebCore::AccessibilityObject::ariaCurrentState):
(WebCore::AccessibilityObject::hasTagName):
* accessibility/AccessibilityObject.h:
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityAttributeNames]):
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
* html/HTMLAttributeNames.in:
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):
Source/WebInspectorUI:
Added support for ARIA 1.1 aria-current.
* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Models/DOMNode.js:
* UserInterface/Views/DOMNodeDetailsSidebarPanel.js:
LayoutTests:
* accessibility/aria-current-expected.txt: Added.
* accessibility/aria-current.html: Added.
* inspector/dom/getAccessibilityPropertiesForNode_ariaCurrent-expected.txt: Added.
* inspector/dom/getAccessibilityPropertiesForNode_ariaCurrent.html: Added.
* platform/gtk/TestExpectations:
* platform/win/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolDOMjson">trunk/Source/JavaScriptCore/inspector/protocol/DOM.json</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjecth">trunk/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAttributeNamesin">trunk/Source/WebCore/html/HTMLAttributeNames.in</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilityariacurrentexpectedtxt">trunk/LayoutTests/accessibility/aria-current-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityariacurrenthtml">trunk/LayoutTests/accessibility/aria-current.html</a></li>
<li><a href="#trunkLayoutTestsinspectordomgetAccessibilityPropertiesForNode_ariaCurrentexpectedtxt">trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode_ariaCurrent-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordomgetAccessibilityPropertiesForNode_ariaCurrenthtml">trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode_ariaCurrent.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189641 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-12 00:38:47 UTC (rev 189641)
+++ trunk/LayoutTests/ChangeLog 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-09-11 Nan Wang <n_wang@apple.com>
+
+ AX: ARIA 1.1 @aria-current
+ https://bugs.webkit.org/show_bug.cgi?id=146012
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/aria-current-expected.txt: Added.
+ * accessibility/aria-current.html: Added.
+ * inspector/dom/getAccessibilityPropertiesForNode_ariaCurrent-expected.txt: Added.
+ * inspector/dom/getAccessibilityPropertiesForNode_ariaCurrent.html: Added.
+ * platform/gtk/TestExpectations:
+ * platform/win/TestExpectations:
+
</ins><span class="cx"> 2015-09-11 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-overridesexpires.html as flaky for
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityariacurrentexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/aria-current-expected.txt (0 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/aria-current-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/aria-current-expected.txt 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+Nav1
+Nav2
+Nav3
+Nav4
+Nav5
+Nav6
+Nav7
+Nav8
+Nav9
+Nav10
+Nav11
+Nav12
+Nav13
+Nav14
+Nav15
+Nav16
+This tests that aria-current causes the right attribute to be returned.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS: AXARIACurrent is false
+PASS: AXARIACurrent is false
+PASS: AXARIACurrent is false
+PASS: AXARIACurrent is false
+PASS: AXARIACurrent is false
+PASS: AXARIACurrent is false
+PASS: AXARIACurrent is page
+PASS: AXARIACurrent is step
+PASS: AXARIACurrent is location
+PASS: AXARIACurrent is date
+PASS: AXARIACurrent is time
+PASS: AXARIACurrent is true
+PASS: AXARIACurrent is true
+PASS: AXARIACurrent is true
+PASS: AXARIACurrent is page
+PASS: AXARIACurrent is step
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilityariacurrenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/aria-current.html (0 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/aria-current.html (rev 0)
+++ trunk/LayoutTests/accessibility/aria-current.html 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<nav role="navigation">
+ <!-- All of these eval to 'false' -->
+ <ul><li><a class="ex" data-expected="false" href="/">Nav1</a></li></ul>
+ <ul><li><a class="ex" data-expected="false" href="/" aria-current="false">Nav2</a></li></ul>
+ <ul><li><a class="ex" data-expected="false" href="/" aria-current="">Nav3</a></li></ul>
+ <ul><li><a class="ex" data-expected="false" href="/" aria-current=" ">Nav4</a></li></ul>
+ <ul><li><a class="ex" data-expected="false" href="/" aria-current=" ">Nav5</a></li></ul> <!-- tab char -->
+ <ul><li><a class="ex" data-expected="false" href="/" aria-current="
+ ">Nav6</a></li></ul> <!-- newline char -->
+
+ <!-- Known token values in ARIA 1.1 -->
+ <ul><li><a class="ex" data-expected="page" href="/" aria-current="page">Nav7</a></li></ul>
+ <ul><li><a class="ex" data-expected="step" href="/" aria-current="step">Nav8</a></li></ul>
+ <ul><li><a class="ex" data-expected="location" href="/" aria-current="location">Nav9</a></li></ul>
+ <ul><li><a class="ex" data-expected="date" href="/" aria-current="date">Nav10</a></li></ul>
+ <ul><li><a class="ex" data-expected="time" href="/" aria-current="time">Nav11</a></li></ul>
+ <ul><li><a class="ex" data-expected="true" href="/" aria-current="true">Nav12</a></li></ul>
+
+ <!-- All other string values -->
+ <ul><li><a class="ex" data-expected="true" href="/" aria-current="sometext">Nav13</a></li></ul>
+ <ul><li><a class="ex" data-expected="true" href="/" aria-current="page step">Nav14</a></li></ul>
+ <ul><li><a class="ex" data-expected="page" href="/" aria-current="page ">Nav15</a></li></ul>
+ <ul><li><a class="ex" data-expected="step" href="/" aria-current=" step ">Nav16</a></li></ul>
+</nav>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that aria-current causes the right attribute to be returned.");
+
+ function verify(value, expectation, element) {
+ if (value === expectation)
+ debug("PASS: AXARIACurrent is " + value);
+ else
+ debug("FAIL: AXARIACurrent is " + value + ". Expected: " + expectation + ". " + (element ? element.outerHTML : ""));
+ }
+
+ if (window.accessibilityController) {
+ var examples = document.querySelectorAll(".ex");
+ for (var i = 0, c = examples.length; i < c; i++) {
+ var el = examples[i];
+ el.focus();
+ var expectation = el.getAttribute("data-expected");
+ var value = accessibilityController.focusedElement.stringAttributeValue('AXARIACurrent');
+ verify(value, expectation, el);
+ }
+ }
+
+</script>
+
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordomgetAccessibilityPropertiesForNode_ariaCurrentexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode_ariaCurrent-expected.txt (0 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode_ariaCurrent-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode_ariaCurrent-expected.txt 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+Checking Web Inspector protocol (specifically aria-current attribute) for the Accessibility Node Inspector.
+
+Total elements to be tested: 16.
+
+<a data-expected="step" href="/" aria-current=" step ">Nav16</a>
+ current: step
+
+<a data-expected="page" href="/" aria-current="page ">Nav15</a>
+ current: page
+
+<a data-expected="true" href="/" aria-current="page step">Nav14</a>
+ current: true
+
+<a data-expected="true" href="/" aria-current="sometext">Nav13</a>
+ current: true
+
+<a data-expected="true" href="/" aria-current="true">Nav12</a>
+ current: true
+
+<a data-expected="time" href="/" aria-current="time">Nav11</a>
+ current: time
+
+<a data-expected="date" href="/" aria-current="date">Nav10</a>
+ current: date
+
+<a data-expected="location" href="/" aria-current="location">Nav9</a>
+ current: location
+
+<a data-expected="step" href="/" aria-current="step">Nav8</a>
+ current: step
+
+<a data-expected="page" href="/" aria-current="page">Nav7</a>
+ current: page
+
+<a data-expected="false" href="/" aria-current="
+ ">Nav6</a>
+
+<a data-expected="false" href="/" aria-current=" ">Nav5</a>
+
+<a data-expected="false" href="/" aria-current=" ">Nav4</a>
+
+<a data-expected="false" href="/" aria-current="">Nav3</a>
+
+<a data-expected="false" href="/" aria-current="false">Nav2</a>
+
+<a data-expected="false" href="/">Nav1</a>
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordomgetAccessibilityPropertiesForNode_ariaCurrenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode_ariaCurrent.html (0 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode_ariaCurrent.html (rev 0)
+++ trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode_ariaCurrent.html 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -0,0 +1,113 @@
</span><ins>+<html>
+<head>
+<script type="text/javascript" src="../../http/tests/inspector/resources/protocol-test.js"></script>
+</head>
+<body onLoad="runTest()">
+
+<p>Checking Web Inspector protocol (specifically aria-current attribute) for the Accessibility Node Inspector.</p>
+
+<div id="examples">
+
+ <!-- All of these eval to 'false', ARIACurrent should not be set -->
+ <ul><li><a class="ex" data-expected="false" href="/">Nav1</a></li></ul>
+ <ul><li><a class="ex" data-expected="false" href="/" aria-current="false">Nav2</a></li></ul>
+ <ul><li><a class="ex" data-expected="false" href="/" aria-current="">Nav3</a></li></ul>
+ <ul><li><a class="ex" data-expected="false" href="/" aria-current=" ">Nav4</a></li></ul>
+ <ul><li><a class="ex" data-expected="false" href="/" aria-current=" ">Nav5</a></li></ul> <!-- tab char -->
+ <ul><li><a class="ex" data-expected="false" href="/" aria-current="
+ ">Nav6</a></li></ul> <!-- newline char -->
+
+ <!-- Known token values in ARIA 1.1 -->
+ <ul><li><a class="ex" data-expected="page" href="/" aria-current="page">Nav7</a></li></ul>
+ <ul><li><a class="ex" data-expected="step" href="/" aria-current="step">Nav8</a></li></ul>
+ <ul><li><a class="ex" data-expected="location" href="/" aria-current="location">Nav9</a></li></ul>
+ <ul><li><a class="ex" data-expected="date" href="/" aria-current="date">Nav10</a></li></ul>
+ <ul><li><a class="ex" data-expected="time" href="/" aria-current="time">Nav11</a></li></ul>
+ <ul><li><a class="ex" data-expected="true" href="/" aria-current="true">Nav12</a></li></ul>
+
+ <!-- All other string values -->
+ <ul><li><a class="ex" data-expected="true" href="/" aria-current="sometext">Nav13</a></li></ul>
+ <ul><li><a class="ex" data-expected="true" href="/" aria-current="page step">Nav14</a></li></ul>
+ <ul><li><a class="ex" data-expected="page" href="/" aria-current="page ">Nav15</a></li></ul>
+ <ul><li><a class="ex" data-expected="step" href="/" aria-current=" step ">Nav16</a></li></ul>
+
+</div>
+
+<script type="text/javascript">
+
+function $(id) {
+ return document.getElementById(id);
+}
+
+function cleanup() {
+ // Hide the test element container to avoid irrelevant output diffs on subsequent updates.
+ $("examples").style.display = "none";
+}
+
+function test() {
+
+ var examples = [];
+ var documentNodeId = null;
+ var bodyNodeId = null;
+
+ function onGotDocument(response) {
+ InspectorProtocol.checkForError(response);
+ documentNodeId = response.result.root.nodeId;
+ InspectorProtocol.sendCommand("DOM.querySelectorAll", {"nodeId": documentNodeId, "selector": ".ex"}, onGotQuerySelectorAll);
+ }
+
+ function onGotQuerySelectorAll(response) {
+ InspectorProtocol.checkForError(response);
+ examples = response.result.nodeIds;
+ ProtocolTest.log("Total elements to be tested: " + examples.length + ".");
+ loop();
+ }
+
+ function loop() {
+ if (examples.length) {
+ InspectorProtocol.sendCommand("DOM.getOuterHTML", {"nodeId": examples[examples.length-1]}, onGotOuterHTML);
+ } else {
+ finishTest();
+ }
+ }
+
+ function onGotOuterHTML(response) {
+ InspectorProtocol.checkForError(response);
+ var outerHTML = response.result.outerHTML;
+ outerHTML = outerHTML.replace(/ class="ex"/g, ""); // remove any duplicated, unnecessary class attributes
+ ProtocolTest.log("\n" + outerHTML);
+ InspectorProtocol.sendCommand("DOM.getAccessibilityPropertiesForNode", {"nodeId": examples[examples.length-1]}, onGotAccessibilityProperties);
+ }
+
+ function onGotAccessibilityProperties(response) {
+ InspectorProtocol.checkForError(response);
+ logAccessibilityProperties(response.result.properties);
+ examples.pop();
+ loop();
+ }
+
+ function logAccessibilityProperties(properties) {
+ for (var key in properties) {
+ var value = properties[key];
+ switch (key){
+ case "current":
+ ProtocolTest.log(" " + key + ": " + value);
+ break;
+ default:
+ continue;
+ }
+ }
+ }
+
+ function finishTest() {
+ InspectorProtocol.sendCommand("Runtime.evaluate", {"expression": "cleanup()"}, function(){
+ ProtocolTest.completeTest();
+ });
+ }
+
+ InspectorProtocol.sendCommand("DOM.getDocument", {}, onGotDocument);
+
+}
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (189641 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2015-09-12 00:38:47 UTC (rev 189641)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -613,6 +613,8 @@
</span><span class="cx"> webkit.org/b/146731 fast/hidpi/filters-multiple.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/146731 fast/hidpi/filters-reference.html [ ImageOnlyFailure ]
</span><span class="cx">
</span><ins>+webkit.org/b/149016 accessibility/aria-current.html [ Skip ]
+
</ins><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # End of Expected failures
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (189641 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2015-09-12 00:38:47 UTC (rev 189641)
+++ trunk/LayoutTests/platform/win/TestExpectations 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -618,6 +618,9 @@
</span><span class="cx"> animations/trigger-container-scroll-simple.html [ Skip ]
</span><span class="cx"> animations/trigger-container-scroll-boundaries.html [ Skip ]
</span><span class="cx">
</span><ins>+# TODO aria-current is not supported
+webkit.org/b/149018 accessibility/aria-current.html [ Skip ]
+
</ins><span class="cx"> ################################################################################
</span><span class="cx"> ########### End Missing Functionality Prevents Testing ##############
</span><span class="cx"> ################################################################################
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189641 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-12 00:38:47 UTC (rev 189641)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-09-11 Nan Wang <n_wang@apple.com>
+
+ AX: ARIA 1.1 @aria-current
+ https://bugs.webkit.org/show_bug.cgi?id=146012
+
+ Reviewed by Chris Fleizach.
+
+ Updated inspector to support aria-current.
+
+ * inspector/protocol/DOM.json:
+
</ins><span class="cx"> 2015-09-11 Sukolsak Sakshuwong <sukolsak@gmail.com>
</span><span class="cx">
</span><span class="cx"> Add initial support for floats in WebAsssembly
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolDOMjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/DOM.json (189641 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/DOM.json 2015-09-12 00:38:47 UTC (rev 189641)
+++ trunk/Source/JavaScriptCore/inspector/protocol/DOM.json 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -80,6 +80,7 @@
</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><span class="cx"> { "name": "controlledNodeIds", "type": "array", "items": { "$ref": "NodeId" }, "optional": true, "description": "Array of <code>DOMNode</code> ids of any nodes referenced via @aria-controls." },
</span><ins>+ { "name": "current", "type": "string", "optional": true, "enum": ["true", "false", "page", "step", "location", "date", "time"], "description": "Current item within a container or set of related elements." },
</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></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189641 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-12 00:38:47 UTC (rev 189641)
+++ trunk/Source/WebCore/ChangeLog 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-09-11 Nan Wang <n_wang@apple.com>
+
+ AX: ARIA 1.1 @aria-current
+ https://bugs.webkit.org/show_bug.cgi?id=146012
+
+ Reviewed by Chris Fleizach.
+
+ Tests: accessibility/aria-current.html
+ inspector/dom/getAccessibilityPropertiesForNode_ariaCurrent.html
+
+ Added support for ARIA 1.1 aria-current.
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::invalidStatus):
+ (WebCore::AccessibilityObject::ariaCurrentState):
+ (WebCore::AccessibilityObject::hasTagName):
+ * accessibility/AccessibilityObject.h:
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeNames]):
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+ * html/HTMLAttributeNames.in:
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):
+
</ins><span class="cx"> 2015-09-11 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> DOMTokenList update steps for classList don't follow the spec
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (189641 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-09-12 00:38:47 UTC (rev 189641)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -1820,6 +1820,30 @@
</span><span class="cx"> return trueValue;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+AccessibilityARIACurrentState AccessibilityObject::ariaCurrentState() const
+{
+ // aria-current can return false (default), true, page, step, location, date or time.
+ String currentStateValue = stripLeadingAndTrailingHTMLSpaces(getAttribute(aria_currentAttr));
+
+ // If "false", empty, or missing, return false state.
+ if (currentStateValue.isEmpty() || currentStateValue == "false")
+ return ARIACurrentFalse;
+
+ if (currentStateValue == "page")
+ return ARIACurrentPage;
+ if (currentStateValue == "step")
+ return ARIACurrentStep;
+ if (currentStateValue == "location")
+ return ARIACurrentLocation;
+ if (currentStateValue == "date")
+ return ARIACurrentDate;
+ if (currentStateValue == "time")
+ return ARIACurrentTime;
+
+ // Any value not included in the list of allowed values should be treated as "true".
+ return ARIACurrentTrue;
+}
+
</ins><span class="cx"> bool AccessibilityObject::hasTagName(const QualifiedName& tagName) const
</span><span class="cx"> {
</span><span class="cx"> Node* node = this->node();
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (189641 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2015-09-12 00:38:47 UTC (rev 189641)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -436,6 +436,8 @@
</span><span class="cx"> enum AccessibilityMathScriptObjectType { Subscript, Superscript };
</span><span class="cx"> enum AccessibilityMathMultiscriptObjectType { PreSubscript, PreSuperscript, PostSubscript, PostSuperscript };
</span><span class="cx">
</span><ins>+enum AccessibilityARIACurrentState { ARIACurrentFalse, ARIACurrentTrue, ARIACurrentPage, ARIACurrentStep, ARIACurrentLocation, ARIACurrentDate, ARIACurrentTime };
+
</ins><span class="cx"> class AccessibilityObject : public RefCounted<AccessibilityObject> {
</span><span class="cx"> protected:
</span><span class="cx"> AccessibilityObject();
</span><span class="lines">@@ -623,6 +625,7 @@
</span><span class="cx"> String identifierAttribute() const;
</span><span class="cx"> void classList(Vector<String>&) const;
</span><span class="cx"> const AtomicString& roleDescription() const;
</span><ins>+ AccessibilityARIACurrentState ariaCurrentState() const;
</ins><span class="cx">
</span><span class="cx"> bool supportsARIASetSize() const;
</span><span class="cx"> bool supportsARIAPosInSet() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (189641 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-09-12 00:38:47 UTC (rev 189641)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -248,6 +248,10 @@
</span><span class="cx"> #define NSAccessibilityDOMIdentifierAttribute @"AXDOMIdentifier"
</span><span class="cx"> #define NSAccessibilityDOMClassListAttribute @"AXDOMClassList"
</span><span class="cx">
</span><ins>+#ifndef NSAccessibilityARIACurrentAttribute
+#define NSAccessibilityARIACurrentAttribute @"AXARIACurrent"
+#endif
+
</ins><span class="cx"> // Search
</span><span class="cx"> #ifndef NSAccessibilityImmediateDescendantsOnly
</span><span class="cx"> #define NSAccessibilityImmediateDescendantsOnly @"AXImmediateDescendantsOnly"
</span><span class="lines">@@ -1696,6 +1700,10 @@
</span><span class="cx"> if ([additionalAttributes count])
</span><span class="cx"> objectAttributes = [objectAttributes arrayByAddingObjectsFromArray:additionalAttributes];
</span><span class="cx">
</span><ins>+ // Only expose AXARIACurrent attribute when the element is set to be current item.
+ if (m_object->ariaCurrentState() != ARIACurrentFalse)
+ [objectAttributes arrayByAddingObjectsFromArray:@[ NSAccessibilityARIACurrentAttribute ]];
+
</ins><span class="cx"> return objectAttributes;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2870,6 +2878,26 @@
</span><span class="cx"> if ([attributeName isEqualToString: NSAccessibilitySelectedAttribute])
</span><span class="cx"> return [NSNumber numberWithBool:m_object->isSelected()];
</span><span class="cx">
</span><ins>+ if ([attributeName isEqualToString: NSAccessibilityARIACurrentAttribute]) {
+ switch (m_object->ariaCurrentState()) {
+ case ARIACurrentFalse:
+ return @"false";
+ case ARIACurrentPage:
+ return @"page";
+ case ARIACurrentStep:
+ return @"step";
+ case ARIACurrentLocation:
+ return @"location";
+ case ARIACurrentTime:
+ return @"time";
+ case ARIACurrentDate:
+ return @"date";
+ default:
+ case ARIACurrentTrue:
+ return @"true";
+ }
+ }
+
</ins><span class="cx"> if ([attributeName isEqualToString: NSAccessibilityServesAsTitleForUIElementsAttribute] && m_object->isMenuButton()) {
</span><span class="cx"> AccessibilityObject* uiElement = downcast<AccessibilityRenderObject>(*m_object).menuForMenuButton();
</span><span class="cx"> if (uiElement)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAttributeNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAttributeNames.in (189641 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAttributeNames.in 2015-09-12 00:38:47 UTC (rev 189641)
+++ trunk/Source/WebCore/html/HTMLAttributeNames.in 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> aria-busy
</span><span class="cx"> aria-checked
</span><span class="cx"> aria-controls
</span><ins>+aria-current
</ins><span class="cx"> aria-describedby
</span><span class="cx"> aria-disabled
</span><span class="cx"> aria-dropeffect
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (189641 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2015-09-12 00:38:47 UTC (rev 189641)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -1523,6 +1523,7 @@
</span><span class="cx"> auto checked = Inspector::Protocol::DOM::AccessibilityProperties::Checked::False;
</span><span class="cx"> RefPtr<Inspector::Protocol::Array<int>> childNodeIds;
</span><span class="cx"> RefPtr<Inspector::Protocol::Array<int>> controlledNodeIds;
</span><ins>+ auto currentState = Inspector::Protocol::DOM::AccessibilityProperties::Current::False;
</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">@@ -1587,6 +1588,31 @@
</span><span class="cx"> controlledNodeIds->addItem(pushNodePathToFrontend(controlledElement));
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ switch (axObject->ariaCurrentState()) {
+ case ARIACurrentFalse:
+ currentState = Inspector::Protocol::DOM::AccessibilityProperties::Current::False;
+ break;
+ case ARIACurrentPage:
+ currentState = Inspector::Protocol::DOM::AccessibilityProperties::Current::Page;
+ break;
+ case ARIACurrentStep:
+ currentState = Inspector::Protocol::DOM::AccessibilityProperties::Current::Step;
+ break;
+ case ARIACurrentLocation:
+ currentState = Inspector::Protocol::DOM::AccessibilityProperties::Current::Location;
+ break;
+ case ARIACurrentDate:
+ currentState = Inspector::Protocol::DOM::AccessibilityProperties::Current::Date;
+ break;
+ case ARIACurrentTime:
+ currentState = Inspector::Protocol::DOM::AccessibilityProperties::Current::Time;
+ break;
+ default:
+ case ARIACurrentTrue:
+ currentState = Inspector::Protocol::DOM::AccessibilityProperties::Current::True;
+ break;
+ }
</ins><span class="cx">
</span><span class="cx"> disabled = !axObject->isEnabled();
</span><span class="cx"> exists = true;
</span><span class="lines">@@ -1724,6 +1750,8 @@
</span><span class="cx"> value->setChildNodeIds(childNodeIds);
</span><span class="cx"> if (controlledNodeIds)
</span><span class="cx"> value->setControlledNodeIds(controlledNodeIds);
</span><ins>+ if (currentState != Inspector::Protocol::DOM::AccessibilityProperties::Current::False)
+ value->setCurrent(currentState);
</ins><span class="cx"> if (disabled)
</span><span class="cx"> value->setDisabled(disabled);
</span><span class="cx"> if (supportsExpanded)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (189641 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-09-12 00:38:47 UTC (rev 189641)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-09-11 Nan Wang <n_wang@apple.com>
+
+ AX: ARIA 1.1 @aria-current
+ https://bugs.webkit.org/show_bug.cgi?id=146012
+
+ Reviewed by Chris Fleizach.
+
+ Added support for ARIA 1.1 aria-current.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Models/DOMNode.js:
+ * UserInterface/Views/DOMNodeDetailsSidebarPanel.js:
+
</ins><span class="cx"> 2015-09-10 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Styles sidebar says Media: all when it should say Media: screen
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (189641 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-09-12 00:38:47 UTC (rev 189641)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -162,12 +162,14 @@
</span><span class="cx"> localizedStrings["Copy as HTML"] = "Copy as HTML";
</span><span class="cx"> localizedStrings["Could not fetch properties. Object may no longer exist."] = "Could not fetch properties. Object may no longer exist.";
</span><span class="cx"> localizedStrings["Create a new tab"] = "Create a new tab";
</span><ins>+localizedStrings["Current"] = "Current";
</ins><span class="cx"> localizedStrings["Cursor"] = "Cursor";
</span><span class="cx"> localizedStrings["Custom"] = "Custom";
</span><span class="cx"> localizedStrings["Data"] = "Data";
</span><span class="cx"> localizedStrings["Data returned from the database is too large."] = "Data returned from the database is too large.";
</span><span class="cx"> localizedStrings["Database no longer has expected version."] = "Database no longer has expected version.";
</span><span class="cx"> localizedStrings["Databases"] = "Databases";
</span><ins>+localizedStrings["Date"] = "Date";
</ins><span class="cx"> localizedStrings["Debug: "] = "Debug: ";
</span><span class="cx"> localizedStrings["Debugger"] = "Debugger";
</span><span class="cx"> localizedStrings["Debugger Paused"] = "Debugger Paused";
</span><span class="lines">@@ -426,6 +428,7 @@
</span><span class="cx"> localizedStrings["Overflow"] = "Overflow";
</span><span class="cx"> localizedStrings["Owns"] = "Owns";
</span><span class="cx"> localizedStrings["Padding"] = "Padding";
</span><ins>+localizedStrings["Page"] = "Page";
</ins><span class="cx"> localizedStrings["Page Issue"] = "Page Issue";
</span><span class="cx"> localizedStrings["Paint"] = "Paint";
</span><span class="cx"> localizedStrings["Paints"] = "Paints";
</span><span class="lines">@@ -549,6 +552,7 @@
</span><span class="cx"> localizedStrings["Start Recording"] = "Start Recording";
</span><span class="cx"> localizedStrings["Start Time"] = "Start Time";
</span><span class="cx"> localizedStrings["Status"] = "Status";
</span><ins>+localizedStrings["Step"] = "Step";
</ins><span class="cx"> localizedStrings["Step into (%s or %s)"] = "Step into (%s or %s)";
</span><span class="cx"> localizedStrings["Step out (%s or %s)"] = "Step out (%s or %s)";
</span><span class="cx"> localizedStrings["Step over (%s or %s)"] = "Step over (%s or %s)";
</span><span class="lines">@@ -577,6 +581,7 @@
</span><span class="cx"> localizedStrings["The %s \ntable is empty."] = "The %s \ntable is empty.";
</span><span class="cx"> localizedStrings["This Element"] = "This Element";
</span><span class="cx"> localizedStrings["This property needs a value.\nClick to open autocomplete."] = "This property needs a value.\nClick to open autocomplete.";
</span><ins>+localizedStrings["Time"] = "Time";
</ins><span class="cx"> localizedStrings["Time until the load event fired, click to show the Network Requests timeline"] = "Time until the load event fired, click to show the Network Requests timeline";
</span><span class="cx"> localizedStrings["Timeline Events"] = "Timeline Events";
</span><span class="cx"> localizedStrings["Timeline Recording %d"] = "Timeline Recording %d";
</span><span class="lines">@@ -596,6 +601,7 @@
</span><span class="cx"> localizedStrings["Transform"] = "Transform";
</span><span class="cx"> localizedStrings["Transition"] = "Transition";
</span><span class="cx"> localizedStrings["Triggered Breakpoint"] = "Triggered Breakpoint";
</span><ins>+localizedStrings["True"] = "True";
</ins><span class="cx"> localizedStrings["Type"] = "Type";
</span><span class="cx"> localizedStrings["Type Issue"] = "Type Issue";
</span><span class="cx"> localizedStrings["Type information for variable: %s"] = "Type information for variable: %s";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsDOMNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js (189641 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js 2015-09-12 00:38:47 UTC (rev 189641)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -426,6 +426,7 @@
</span><span class="cx"> checked: accessibilityProperties.checked,
</span><span class="cx"> childNodeIds: accessibilityProperties.childNodeIds,
</span><span class="cx"> controlledNodeIds: accessibilityProperties.controlledNodeIds,
</span><ins>+ current: accessibilityProperties.current,
</ins><span class="cx"> disabled: accessibilityProperties.disabled,
</span><span class="cx"> exists: accessibilityProperties.exists,
</span><span class="cx"> expanded: accessibilityProperties.expanded,
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMNodeDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js (189641 => 189642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js 2015-09-12 00:38:47 UTC (rev 189641)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js 2015-09-12 00:47:20 UTC (rev 189642)
</span><span class="lines">@@ -67,6 +67,7 @@
</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><span class="cx"> this._accessibilityNodeControlsRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Controls"));
</span><ins>+ this._accessibilityNodeCurrentRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Current"));
</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._accessibilityNodeFlowsRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Flows"));
</span><span class="lines">@@ -346,6 +347,31 @@
</span><span class="cx"> var childNodeLinkList = linkListForNodeIds(accessibilityProperties.childNodeIds);
</span><span class="cx">
</span><span class="cx"> var controlledNodeLinkList = linkListForNodeIds(accessibilityProperties.controlledNodeIds);
</span><ins>+
+ var current = "";
+ switch (accessibilityProperties.current) {
+ case DOMAgent.AccessibilityPropertiesCurrent.True:
+ current = WebInspector.UIString("True");
+ break;
+ case DOMAgent.AccessibilityPropertiesCurrent.Page:
+ current = WebInspector.UIString("Page");
+ break;
+ case DOMAgent.AccessibilityPropertiesCurrent.Location:
+ current = WebInspector.UIString("Location");
+ break;
+ case DOMAgent.AccessibilityPropertiesCurrent.Step:
+ current = WebInspector.UIString("Step");
+ break;
+ case DOMAgent.AccessibilityPropertiesCurrent.Date:
+ current = WebInspector.UIString("Date");
+ break;
+ case DOMAgent.AccessibilityPropertiesCurrent.Time:
+ current = WebInspector.UIString("Time");
+ break;
+ default:
+ current = "";
+ }
+
</ins><span class="cx"> var disabled = booleanValueToLocalizedStringIfTrue("disabled");
</span><span class="cx"> var expanded = booleanValueToLocalizedStringIfPropertyDefined("expanded");
</span><span class="cx"> var flowedNodeLinkList = linkListForNodeIds(accessibilityProperties.flowedNodeIds);
</span><span class="lines">@@ -462,6 +488,7 @@
</span><span class="cx"> this._accessibilityNodeCheckedRow.value = checked;
</span><span class="cx"> this._accessibilityNodeChildrenRow.value = childNodeLinkList || "";
</span><span class="cx"> this._accessibilityNodeControlsRow.value = controlledNodeLinkList || "";
</span><ins>+ this._accessibilityNodeCurrentRow.value = current;
</ins><span class="cx"> this._accessibilityNodeDisabledRow.value = disabled;
</span><span class="cx"> this._accessibilityNodeExpandedRow.value = expanded;
</span><span class="cx"> this._accessibilityNodeFlowsRow.value = flowedNodeLinkList || "";
</span><span class="lines">@@ -505,6 +532,7 @@
</span><span class="cx"> this._accessibilityNodeFocusedRow,
</span><span class="cx"> this._accessibilityNodeBusyRow,
</span><span class="cx"> this._accessibilityNodeLiveRegionStatusRow,
</span><ins>+ this._accessibilityNodeCurrentRow,
</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>
</div>
</body>
</html>