<!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>[167054] 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/167054">167054</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-09 17:18:49 -0700 (Wed, 09 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Bug in AccessibilityNodeObject::helpText
https://bugs.webkit.org/show_bug.cgi?id=130386
Patch by James Craig <jcraig@apple.com> on 2014-04-09
Reviewed by Chris Fleizach.
Source/WebCore:
Test: accessibility/help-text.html
Ancestor loop was always checking attribute of original node rather than current node.
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::helpText):
LayoutTests:
Tests accessibility help text in a variety of examples.
* accessibility/help-text-expected.txt: Added.
* accessibility/help-text.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilityhelptextexpectedtxt">trunk/LayoutTests/accessibility/help-text-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityhelptexthtml">trunk/LayoutTests/accessibility/help-text.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167053 => 167054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-10 00:10:30 UTC (rev 167053)
+++ trunk/LayoutTests/ChangeLog 2014-04-10 00:18:49 UTC (rev 167054)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-04-09 James Craig <jcraig@apple.com>
+
+ AX: Bug in AccessibilityNodeObject::helpText
+ https://bugs.webkit.org/show_bug.cgi?id=130386
+
+ Reviewed by Chris Fleizach.
+
+ Tests accessibility help text in a variety of examples.
+
+ * accessibility/help-text-expected.txt: Added.
+ * accessibility/help-text.html: Added.
+
</ins><span class="cx"> 2014-04-09 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed bot maintenance. Re-add a number of passing
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityhelptextexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/help-text-expected.txt (0 => 167054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/help-text-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/help-text-expected.txt 2014-04-10 00:18:49 UTC (rev 167054)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+Tests accessibility help text in a variety of examples.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS: Help text for <a> is ""
+PASS: Help text for <a> is "bar"
+PASS: Help text for <a> is "baz"
+PASS: Help text for <a> is ""
+PASS: Help text for <h1> is "bar"
+PASS: Help text for <a> is ""
+PASS: Help text for <button> is ""
+PASS: Help text for <button> is "bar"
+PASS: Help text for <button> is "baz"
+PASS: Help text for <button> is ""
+PASS: Help text for <table> is "table summary"
+PASS: Help text for <input> is ""
+PASS: Help text for <div> is ""
+PASS: Help text for <main> is "bar"
+PASS: Help text for <button> is ""
+PASS: Help text for <main> is ""
+PASS: Help text for <div> is ""
+PASS: Help text for <a> is "bar"
+PASS: Help text for <div> is ""
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilityhelptexthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/help-text.html (0 => 167054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/help-text.html (rev 0)
+++ trunk/LayoutTests/accessibility/help-text.html 2014-04-10 00:18:49 UTC (rev 167054)
</span><span class="lines">@@ -0,0 +1,85 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<div id="examples">
+
+ <a class="ex" href="#" data-expected="">foo</a>
+ <a class="ex" href="#" title="bar" data-expected="bar">foo</a>
+ <a class="ex" href="#" title="bar" aria-help="baz" data-expected="baz">foo</a>
+ <a class="ex" href="#" title="foo" data-expected=""><!-- no contents, so @title used as label, not help --></a>
+
+ <h1 class="ex" title="bar" data-expected="bar"><a class="ex" href="#" data-expected="">foo</a></h1>
+
+ <button class="ex" data-expected="">foo</button>
+ <button class="ex" title="bar" data-expected="bar">foo</button>
+ <button class="ex" title="bar" aria-help="baz" data-expected="baz">foo</button>
+ <button class="ex" title="foo" data-expected=""><!-- no contents, so @title used as label, not help --></button>
+
+ <table class="ex" summary="table summary" data-expected="table summary">
+ <caption class="ex" data-expected="">caption</caption>
+ <tr>
+ <td>
+ <input class="ex" type="checkbox" data-expected="">
+ <div class="ex" role="text" data-expected="">text</div>
+ </td>
+ </tr>
+ </table>
+
+ <main class="ex" aria-help="bar" data-expected="bar">
+ <button class="ex" data-expected="">foo</button>
+ </main>
+
+ <main class="ex" role="group" title="bar" data-expected="">
+ <div class="ex" role="group" data-expected="">foo</div>
+ </main>
+
+ <a href="" class="ex" title="bar" data-expected="bar">
+ <div class="ex" data-expected="">foo</div>
+ </a>
+
+</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ if (window.testRunner && window.accessibilityController) {
+
+ description("Tests accessibility help text in a variety of examples.");
+
+ var examples = document.querySelectorAll("#examples .ex");
+ for (var i = 0, c = examples.length; i < c; i++) {
+ var el = examples[i];
+ if (!el)
+ continue;
+ var expectation = el.getAttribute("data-expected");
+ var id = el.id;
+ var tag = el.tagName.toLowerCase();
+ if (!id)
+ el.id = id = "generatedId_" + i;
+ var ax = accessibilityController.accessibleElementById(id);
+ if (!ax)
+ continue;
+ var output = ax.helpText.replace("AXHelp: ", "");
+ var result = document.getElementById("console");
+ if (expectation === output)
+ result.textContent += "PASS: Help text for <" + tag +"> is \"" + output + "\"\n";
+ else
+ result.textContent += "FAIL: Help text for <" + tag +"> is \"" + output + "\" but expected \"" + expectation + "\"\n";
+ }
+
+ // Once tests are complete, hide all the example markup.
+ document.getElementById("examples").style.display = "none";
+
+ }
+
+</script>
+
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167053 => 167054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-10 00:10:30 UTC (rev 167053)
+++ trunk/Source/WebCore/ChangeLog 2014-04-10 00:18:49 UTC (rev 167054)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-04-09 James Craig <jcraig@apple.com>
+
+ AX: Bug in AccessibilityNodeObject::helpText
+ https://bugs.webkit.org/show_bug.cgi?id=130386
+
+ Reviewed by Chris Fleizach.
+
+ Test: accessibility/help-text.html
+
+ Ancestor loop was always checking attribute of original node rather than current node.
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::helpText):
+
</ins><span class="cx"> 2014-04-09 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> Regression: AX: list heuristics sometimes determined as presentational even when explicit roles applied
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (167053 => 167054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-04-10 00:10:30 UTC (rev 167053)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-04-10 00:18:49 UTC (rev 167054)
</span><span class="lines">@@ -1401,28 +1401,16 @@
</span><span class="cx"> String describedBy = ariaDescribedByAttribute();
</span><span class="cx"> if (!describedBy.isEmpty())
</span><span class="cx"> textOrder.append(AccessibilityText(describedBy, SummaryText));
</span><del>-
- // Add help type text that is derived from ancestors.
- for (Node* curr = node(); curr; curr = curr->parentNode()) {
- const AtomicString& summary = getAttribute(summaryAttr);
- if (!summary.isEmpty())
- textOrder.append(AccessibilityText(summary, SummaryText));
-
- // The title attribute should be used as help text unless it is already being used as descriptive text.
- const AtomicString& title = getAttribute(titleAttr);
- if (!title.isEmpty())
- textOrder.append(AccessibilityText(title, TitleTagText));
-
- // Only take help text from an ancestor element if its a group or an unknown role. If help was
- // added to those kinds of elements, it is likely it was meant for a child element.
- AccessibilityObject* axObj = axObjectCache()->getOrCreate(curr);
- if (!axObj)
- return;
-
- AccessibilityRole role = axObj->roleValue();
- if (role != GroupRole && role != UnknownRole)
- break;
- }
</del><ins>+
+ // Summary attribute used as help text on tables.
+ const AtomicString& summary = getAttribute(summaryAttr);
+ if (!summary.isEmpty())
+ textOrder.append(AccessibilityText(summary, SummaryText));
+
+ // The title attribute should be used as help text unless it is already being used as descriptive text.
+ const AtomicString& title = getAttribute(titleAttr);
+ if (!title.isEmpty())
+ textOrder.append(AccessibilityText(title, TitleTagText));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AccessibilityNodeObject::accessibilityText(Vector<AccessibilityText>& textOrder)
</span></span></pre>
</div>
</div>
</body>
</html>