<!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>[200290] 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/200290">200290</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2016-04-30 11:06:47 -0700 (Sat, 30 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: @aria-label attribute should work on <label> element
https://bugs.webkit.org/show_bug.cgi?id=157219
Reviewed by Chris Fleizach.
Source/WebCore:
When there's aria-label on a <label> element, we shouldn't expose it
as the titleUIElement. Instead, we return its aria-label as a title.
Test: accessibility/mac/aria-label-on-label-element.html
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::titleElementText):
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::exposesTitleUIElement):
LayoutTests:
* accessibility/mac/aria-label-on-label-element-expected.txt: Added.
* accessibility/mac/aria-label-on-label-element.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>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitymacarialabelonlabelelementexpectedtxt">trunk/LayoutTests/accessibility/mac/aria-label-on-label-element-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacarialabelonlabelelementhtml">trunk/LayoutTests/accessibility/mac/aria-label-on-label-element.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200289 => 200290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-30 05:40:57 UTC (rev 200289)
+++ trunk/LayoutTests/ChangeLog 2016-04-30 18:06:47 UTC (rev 200290)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-04-30 Nan Wang <n_wang@apple.com>
+
+ AX: @aria-label attribute should work on <label> element
+ https://bugs.webkit.org/show_bug.cgi?id=157219
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/mac/aria-label-on-label-element-expected.txt: Added.
+ * accessibility/mac/aria-label-on-label-element.html: Added.
+
</ins><span class="cx"> 2016-04-29 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Rename getAssignedNodes to assignedNodes and support flattened option
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacarialabelonlabelelementexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/aria-label-on-label-element-expected.txt (0 => 200290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/aria-label-on-label-element-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/mac/aria-label-on-label-element-expected.txt 2016-04-30 18:06:47 UTC (rev 200290)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Some text Some other text
+This tests that the aria-label attribute works on element.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS !titleUIElement1 is true
+PASS input1.title is 'AXTitle: aria label'
+PASS titleUIElement2.isEqual(accessibilityController.accessibleElementById('label2')) is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacarialabelonlabelelementhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/aria-label-on-label-element.html (0 => 200290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/aria-label-on-label-element.html (rev 0)
+++ trunk/LayoutTests/accessibility/mac/aria-label-on-label-element.html 2016-04-30 18:06:47 UTC (rev 200290)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<label for="input" aria-label="aria label">Some text</label>
+<input id="input" type="text" size=20>
+
+<label id="label2" for="input2">Some other text</label>
+<input id="input2" type="text" size=20>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that the aria-label attribute works on <label> element.");
+
+ if (window.accessibilityController) {
+
+ // aria-label on the <label> element return a title for the input, instead of a title ui element.
+ var input1 = accessibilityController.accessibleElementById("input");
+ var titleUIElement1 = input1.titleUIElement();
+ shouldBeTrue("!titleUIElement1");
+ shouldBe("input1.title", "'AXTitle: aria label'");
+
+ // Normal case.
+ var input2 = accessibilityController.accessibleElementById("input2");
+ var titleUIElement2 = input2.titleUIElement();
+ shouldBeTrue("titleUIElement2.isEqual(accessibilityController.accessibleElementById('label2'))");
+ }
+
+</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 (200289 => 200290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-30 05:40:57 UTC (rev 200289)
+++ trunk/Source/WebCore/ChangeLog 2016-04-30 18:06:47 UTC (rev 200290)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-04-30 Nan Wang <n_wang@apple.com>
+
+ AX: @aria-label attribute should work on <label> element
+ https://bugs.webkit.org/show_bug.cgi?id=157219
+
+ Reviewed by Chris Fleizach.
+
+ When there's aria-label on a <label> element, we shouldn't expose it
+ as the titleUIElement. Instead, we return its aria-label as a title.
+
+ Test: accessibility/mac/aria-label-on-label-element.html
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::titleElementText):
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::exposesTitleUIElement):
+
</ins><span class="cx"> 2016-04-29 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [Web IDL] Specify default parameter values for callback parameters
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (200289 => 200290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2016-04-30 05:40:57 UTC (rev 200289)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2016-04-30 18:06:47 UTC (rev 200290)
</span><span class="lines">@@ -1265,6 +1265,11 @@
</span><span class="cx"> if (HTMLLabelElement* label = labelForElement(downcast<Element>(node))) {
</span><span class="cx"> AccessibilityObject* labelObject = axObjectCache()->getOrCreate(label);
</span><span class="cx"> String innerText = label->innerText();
</span><ins>+
+ const AtomicString& ariaLabel = labelObject->getAttribute(aria_labelAttr);
+ if (!ariaLabel.isEmpty())
+ innerText = ariaLabel;
+
</ins><span class="cx"> // Only use the <label> text if there's no ARIA override.
</span><span class="cx"> if (!innerText.isEmpty() && !ariaAccessibilityDescription())
</span><span class="cx"> textOrder.append(AccessibilityText(innerText, LabelByElementText, labelObject));
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (200289 => 200290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-04-30 05:40:57 UTC (rev 200289)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-04-30 18:06:47 UTC (rev 200290)
</span><span class="lines">@@ -1071,6 +1071,15 @@
</span><span class="cx"> if (hasTextAlternative())
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ // When <label> element has aria-label on it, we shouldn't expose it as the titleUIElement,
+ // otherwise its inner text will be announced by a screenreader.
+ if (is<HTMLInputElement>(*this->node()) || AccessibilityObject::isARIAInput(ariaRoleAttribute())) {
+ if (HTMLLabelElement* label = labelForElement(downcast<Element>(node()))) {
+ if (!label->fastGetAttribute(aria_labelAttr).isEmpty())
+ return false;
+ }
+ }
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>