<!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>[206391] 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/206391">206391</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2016-09-26 14:02:42 -0700 (Mon, 26 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Progress: [Mac] Content in label element should be used as AXTitle or AXDescription
https://bugs.webkit.org/show_bug.cgi?id=162573
Reviewed by Chris Fleizach.
Source/WebCore:
Exposed the label element's text as the AXTitle of the progress indicator.
Test: accessibility/mac/progress-with-label-element.html
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::titleElementText):
(WebCore::AccessibilityNodeObject::title):
LayoutTests:
* accessibility/mac/progress-with-label-element-expected.txt: Added.
* accessibility/mac/progress-with-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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitymacprogresswithlabelelementexpectedtxt">trunk/LayoutTests/accessibility/mac/progress-with-label-element-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacprogresswithlabelelementhtml">trunk/LayoutTests/accessibility/mac/progress-with-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 (206390 => 206391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-09-26 20:39:57 UTC (rev 206390)
+++ trunk/LayoutTests/ChangeLog        2016-09-26 21:02:42 UTC (rev 206391)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-09-26 Nan Wang <n_wang@apple.com>
+
+ AX: Progress: [Mac] Content in label element should be used as AXTitle or AXDescription
+ https://bugs.webkit.org/show_bug.cgi?id=162573
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/mac/progress-with-label-element-expected.txt: Added.
+ * accessibility/mac/progress-with-label-element.html: Added.
+
</ins><span class="cx"> 2016-09-26 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking media/media-controls-drag-timeline-set-controls-property.html as flaky on Yosemite Debug WK2.
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacprogresswithlabelelementexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/progress-with-label-element-expected.txt (0 => 206391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/progress-with-label-element-expected.txt         (rev 0)
+++ trunk/LayoutTests/accessibility/mac/progress-with-label-element-expected.txt        2016-09-26 21:02:42 UTC (rev 206391)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+label label wrapping output
+This tests that for progress elements, label should be used as accessible name and title should be used as accessible description.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS prog1.title is 'AXTitle: label'
+PASS prog1.helpText is 'AXHelp: title'
+PASS prog2.title is 'AXTitle: label wrapping output'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacprogresswithlabelelementhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/progress-with-label-element.html (0 => 206391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/progress-with-label-element.html         (rev 0)
+++ trunk/LayoutTests/accessibility/mac/progress-with-label-element.html        2016-09-26 21:02:42 UTC (rev 206391)
</span><span class="lines">@@ -0,0 +1,32 @@
</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="progress">label</label>
+<progress id="progress" title="title" value="22" max="100"></progress>
+
+<label>label wrapping output<progress id="progress2" value="22" max="100"></progress></label>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+ description("This tests that for progress elements, label should be used as accessible name and title should be used as accessible description.");
+
+ if (window.accessibilityController) {
+
+ var prog1 = accessibilityController.accessibleElementById("progress");
+ shouldBe("prog1.title", "'AXTitle: label'");
+ shouldBe("prog1.helpText", "'AXHelp: title'");
+
+ var prog2 = accessibilityController.accessibleElementById("progress2");
+ shouldBe("prog2.title", "'AXTitle: label wrapping output'");
+ }
+</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 (206390 => 206391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-09-26 20:39:57 UTC (rev 206390)
+++ trunk/Source/WebCore/ChangeLog        2016-09-26 21:02:42 UTC (rev 206391)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-09-26 Nan Wang <n_wang@apple.com>
+
+ AX: Progress: [Mac] Content in label element should be used as AXTitle or AXDescription
+ https://bugs.webkit.org/show_bug.cgi?id=162573
+
+ Reviewed by Chris Fleizach.
+
+ Exposed the label element's text as the AXTitle of the progress indicator.
+
+ Test: accessibility/mac/progress-with-label-element.html
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::titleElementText):
+ (WebCore::AccessibilityNodeObject::title):
+
</ins><span class="cx"> 2016-09-26 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline bindings tests after r206386.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (206390 => 206391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp        2016-09-26 20:39:57 UTC (rev 206390)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp        2016-09-26 21:02:42 UTC (rev 206391)
</span><span class="lines">@@ -1238,7 +1238,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> bool isInputTag = is<HTMLInputElement>(*node);
</span><del>- if (isInputTag || AccessibilityObject::isARIAInput(ariaRoleAttribute()) || isControl()) {
</del><ins>+ if (isInputTag || AccessibilityObject::isARIAInput(ariaRoleAttribute()) || isControl() || isProgressIndicator()) {
</ins><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><span class="lines">@@ -1710,7 +1710,7 @@
</span><span class="cx"> return input.valueWithDefault();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (isInputTag || AccessibilityObject::isARIAInput(ariaRoleAttribute()) || isControl()) {
</del><ins>+ if (isInputTag || AccessibilityObject::isARIAInput(ariaRoleAttribute()) || isControl() || isProgressIndicator()) {
</ins><span class="cx"> HTMLLabelElement* label = labelForElement(downcast<Element>(node));
</span><span class="cx"> // Use the label text as the title if 1) the title element is NOT an exposed element and 2) there's no ARIA override.
</span><span class="cx"> if (label && !exposesTitleUIElement() && !ariaAccessibilityDescription().length())
</span></span></pre>
</div>
</div>
</body>
</html>