<!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>[207429] 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/207429">207429</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2016-10-17 14:00:47 -0700 (Mon, 17 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: [Mac] mapping for output elements
https://bugs.webkit.org/show_bug.cgi?id=163471
Reviewed by Chris Fleizach.
Source/WebCore:
Mapped the output element to status role and exposed its text content
as AXTitle.
Test: accessibility/mac/output-element.html
* English.lproj/Localizable.strings:
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::visibleText):
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::isOutput):
* accessibility/AccessibilityObject.h:
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::determineAccessibilityRole):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper roleDescription]):
* platform/LocalizedStrings.cpp:
(WebCore::AXOutputText):
* platform/LocalizedStrings.h:
* platform/efl/LocalizedStringsEfl.cpp:
(WebCore::AXOutputText):
* platform/gtk/LocalizedStringsGtk.cpp:
(WebCore::AXOutputText):
LayoutTests:
* accessibility/mac/output-element-expected.txt: Added.
* accessibility/mac/output-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="#trunkSourceWebCoreEnglishlprojLocalizablestrings">trunk/Source/WebCore/English.lproj/Localizable.strings</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp</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="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformLocalizedStringscpp">trunk/Source/WebCore/platform/LocalizedStrings.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLocalizedStringsh">trunk/Source/WebCore/platform/LocalizedStrings.h</a></li>
<li><a href="#trunkSourceWebCoreplatformeflLocalizedStringsEflcpp">trunk/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkLocalizedStringsGtkcpp">trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitymacoutputelementexpectedtxt">trunk/LayoutTests/accessibility/mac/output-element-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacoutputelementhtml">trunk/LayoutTests/accessibility/mac/output-element.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207428 => 207429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-17 20:57:28 UTC (rev 207428)
+++ trunk/LayoutTests/ChangeLog 2016-10-17 21:00:47 UTC (rev 207429)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-17 Nan Wang <n_wang@apple.com>
+
+ AX: [Mac] mapping for output elements
+ https://bugs.webkit.org/show_bug.cgi?id=163471
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/mac/output-element-expected.txt: Added.
+ * accessibility/mac/output-element.html: Added.
+
</ins><span class="cx"> 2016-10-17 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement DOMPoint/DOMPointReadOnly
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacoutputelementexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/output-element-expected.txt (0 => 207429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/output-element-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/mac/output-element-expected.txt 2016-10-17 21:00:47 UTC (rev 207429)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+output element
+This tests that the output element has correct mapping.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS output.role is 'AXRole: AXGroup'
+PASS output.subrole is 'AXSubrole: AXApplicationStatus'
+PASS output.roleDescription is 'AXRoleDescription: output'
+PASS output.title is 'AXTitle: output element'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacoutputelementhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/output-element.html (0 => 207429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/output-element.html (rev 0)
+++ trunk/LayoutTests/accessibility/mac/output-element.html 2016-10-17 21:00:47 UTC (rev 207429)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<output id="output">output element</output>
+
+
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+ description("This tests that the output element has correct mapping.");
+
+ if (window.accessibilityController) {
+
+ var output = accessibilityController.accessibleElementById("output");
+ shouldBe("output.role", "'AXRole: AXGroup'");
+ shouldBe("output.subrole", "'AXSubrole: AXApplicationStatus'");
+ shouldBe("output.roleDescription", "'AXRoleDescription: output'");
+
+ shouldBe("output.title", "'AXTitle: output element'");
+ }
+</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 (207428 => 207429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-17 20:57:28 UTC (rev 207428)
+++ trunk/Source/WebCore/ChangeLog 2016-10-17 21:00:47 UTC (rev 207429)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-10-17 Nan Wang <n_wang@apple.com>
+
+ AX: [Mac] mapping for output elements
+ https://bugs.webkit.org/show_bug.cgi?id=163471
+
+ Reviewed by Chris Fleizach.
+
+ Mapped the output element to status role and exposed its text content
+ as AXTitle.
+
+ Test: accessibility/mac/output-element.html
+
+ * English.lproj/Localizable.strings:
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::visibleText):
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::isOutput):
+ * accessibility/AccessibilityObject.h:
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper roleDescription]):
+ * platform/LocalizedStrings.cpp:
+ (WebCore::AXOutputText):
+ * platform/LocalizedStrings.h:
+ * platform/efl/LocalizedStringsEfl.cpp:
+ (WebCore::AXOutputText):
+ * platform/gtk/LocalizedStringsGtk.cpp:
+ (WebCore::AXOutputText):
+
</ins><span class="cx"> 2016-10-17 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [DOMJIT] Use DOMJIT::Patchpoint in IC
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojLocalizablestrings"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (207428 => 207429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/Localizable.strings 2016-10-17 20:57:28 UTC (rev 207428)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2016-10-17 21:00:47 UTC (rev 207429)
</span><span class="lines">@@ -970,6 +970,9 @@
</span><span class="cx"> /* accessibility help text for remaining time display */
</span><span class="cx"> "number of seconds of movie remaining" = "number of seconds of movie remaining";
</span><span class="cx">
</span><ins>+/* accessibility role description for an output element */
+"output" = "output";
+
</ins><span class="cx"> /* HTTP result code string */
</span><span class="cx"> "partial content" = "partial content";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (207428 => 207429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2016-10-17 20:57:28 UTC (rev 207428)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2016-10-17 21:00:47 UTC (rev 207429)
</span><span class="lines">@@ -1407,6 +1407,9 @@
</span><span class="cx"> if (isHeading() || isLink())
</span><span class="cx"> useTextUnderElement = true;
</span><span class="cx">
</span><ins>+ if (isOutput())
+ useTextUnderElement = true;
+
</ins><span class="cx"> if (useTextUnderElement) {
</span><span class="cx"> AccessibilityTextUnderElementMode mode;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (207428 => 207429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2016-10-17 20:57:28 UTC (rev 207428)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2016-10-17 21:00:47 UTC (rev 207429)
</span><span class="lines">@@ -3105,6 +3105,12 @@
</span><span class="cx"> Node* node = this->node();
</span><span class="cx"> return node && node->hasTagName(figureTag);
</span><span class="cx"> }
</span><ins>+
+bool AccessibilityObject::isOutput() const
+{
+ Node* node = this->node();
+ return node && node->hasTagName(outputTag);
+}
</ins><span class="cx">
</span><span class="cx"> bool AccessibilityObject::isContainedByPasswordField() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (207428 => 207429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2016-10-17 20:57:28 UTC (rev 207428)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2016-10-17 21:00:47 UTC (rev 207429)
</span><span class="lines">@@ -562,6 +562,7 @@
</span><span class="cx"> bool isSuperscriptStyleGroup() const;
</span><span class="cx"> bool isFigure() const;
</span><span class="cx"> bool isSummary() const { return roleValue() == SummaryRole; }
</span><ins>+ bool isOutput() const;
</ins><span class="cx">
</span><span class="cx"> virtual bool isChecked() const { return false; }
</span><span class="cx"> virtual bool isEnabled() const { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (207428 => 207429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-10-17 20:57:28 UTC (rev 207428)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-10-17 21:00:47 UTC (rev 207429)
</span><span class="lines">@@ -2749,6 +2749,11 @@
</span><span class="cx"> return DetailsRole;
</span><span class="cx"> if (is<HTMLSummaryElement>(node))
</span><span class="cx"> return SummaryRole;
</span><ins>+
+ // http://rawgit.com/w3c/aria/master/html-aam/html-aam.html
+ // Output elements should be mapped to status role.
+ if (isOutput())
+ return ApplicationStatusRole;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> if (is<HTMLVideoElement>(node))
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (207428 => 207429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2016-10-17 20:57:28 UTC (rev 207428)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2016-10-17 21:00:47 UTC (rev 207429)
</span><span class="lines">@@ -2474,6 +2474,9 @@
</span><span class="cx">
</span><span class="cx"> if ([axRole isEqualToString:NSAccessibilityGroupRole]) {
</span><span class="cx">
</span><ins>+ if (m_object->isOutput())
+ return AXOutputText();
+
</ins><span class="cx"> NSString *ariaLandmarkRoleDescription = [self ariaLandmarkRoleDescription];
</span><span class="cx"> if (ariaLandmarkRoleDescription)
</span><span class="cx"> return ariaLandmarkRoleDescription;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLocalizedStringscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (207428 => 207429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LocalizedStrings.cpp 2016-10-17 20:57:28 UTC (rev 207428)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp 2016-10-17 21:00:47 UTC (rev 207429)
</span><span class="lines">@@ -625,6 +625,11 @@
</span><span class="cx"> return WEB_UI_STRING("file upload button", "accessibility role description for a file upload button");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String AXOutputText()
+{
+ return WEB_UI_STRING("output", "accessibility role description for an output element");
+}
+
</ins><span class="cx"> String AXAttachmentRoleText()
</span><span class="cx"> {
</span><span class="cx"> return WEB_UI_STRING("attachment", "accessibility role description for an attachment element");
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLocalizedStringsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LocalizedStrings.h (207428 => 207429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LocalizedStrings.h 2016-10-17 20:57:28 UTC (rev 207428)
+++ trunk/Source/WebCore/platform/LocalizedStrings.h 2016-10-17 21:00:47 UTC (rev 207429)
</span><span class="lines">@@ -166,6 +166,7 @@
</span><span class="cx"> String AXDescriptionListDetailText();
</span><span class="cx"> String AXFooterRoleDescriptionText();
</span><span class="cx"> String AXFileUploadButtonText();
</span><ins>+ String AXOutputText();
</ins><span class="cx"> String AXSearchFieldCancelButtonText();
</span><span class="cx"> String AXAttachmentRoleText();
</span><span class="cx"> String AXDetailsText();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflLocalizedStringsEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp (207428 => 207429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp 2016-10-17 20:57:28 UTC (rev 207428)
+++ trunk/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp 2016-10-17 21:00:47 UTC (rev 207429)
</span><span class="lines">@@ -413,6 +413,11 @@
</span><span class="cx"> return String::fromUTF8("figure");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String AXOutputText()
+{
+ return String::fromUTF8("output");
+}
+
</ins><span class="cx"> String AXEmailFieldText()
</span><span class="cx"> {
</span><span class="cx"> return String::fromUTF8("email field");
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkLocalizedStringsGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp (207428 => 207429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-10-17 20:57:28 UTC (rev 207428)
+++ trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-10-17 21:00:47 UTC (rev 207429)
</span><span class="lines">@@ -461,6 +461,11 @@
</span><span class="cx"> return String::fromUTF8(_("figure"));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String AXOutputText()
+{
+ return String::fromUTF8(_("output"));
+}
+
</ins><span class="cx"> String AXEmailFieldText()
</span><span class="cx"> {
</span><span class="cx"> return String::fromUTF8(_("email field"));
</span></span></pre>
</div>
</div>
</body>
</html>