<!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>[207401] 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/207401">207401</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2016-10-16 22:58:18 -0700 (Sun, 16 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: [Mac] roleDescription for AXTextField input types
https://bugs.webkit.org/show_bug.cgi?id=163419
<rdar://problem/28766192>
Reviewed by Darin Adler.
Source/WebCore:
Provided more detailed role description for input types that
exposed as standard text fields on the mac.
Changes are covered in modified test expectation.
* English.lproj/Localizable.strings:
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper roleDescription]):
* platform/LocalizedStrings.cpp:
(WebCore::AXEmailFieldText):
(WebCore::AXTelephoneFieldText):
(WebCore::AXURLFieldText):
(WebCore::AXDateFieldText):
(WebCore::AXTimeFieldText):
* platform/LocalizedStrings.h:
* platform/efl/LocalizedStringsEfl.cpp:
(WebCore::AXEmailFieldText):
(WebCore::AXTelephoneFieldText):
(WebCore::AXURLFieldText):
(WebCore::AXDateFieldText):
(WebCore::AXTimeFieldText):
* platform/gtk/LocalizedStringsGtk.cpp:
(WebCore::AXEmailFieldText):
(WebCore::AXTelephoneFieldText):
(WebCore::AXURLFieldText):
(WebCore::AXDateFieldText):
(WebCore::AXTimeFieldText):
LayoutTests:
* platform/mac/accessibility/roles-exposed-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityrolesexposedexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt</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="#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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207400 => 207401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-17 03:41:01 UTC (rev 207400)
+++ trunk/LayoutTests/ChangeLog 2016-10-17 05:58:18 UTC (rev 207401)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-16 Nan Wang <n_wang@apple.com>
+
+ AX: [Mac] roleDescription for AXTextField input types
+ https://bugs.webkit.org/show_bug.cgi?id=163419
+ <rdar://problem/28766192>
+
+ Reviewed by Darin Adler.
+
+ * platform/mac/accessibility/roles-exposed-expected.txt:
+
</ins><span class="cx"> 2016-10-16 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed GTK test gardening
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityrolesexposedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt (207400 => 207401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt 2016-10-17 03:41:01 UTC (rev 207400)
+++ trunk/LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt 2016-10-17 05:58:18 UTC (rev 207401)
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> input[type='date']
</span><span class="cx"> AXRole: AXTextField
</span><span class="cx"> AXSubrole:
</span><del>- AXRoleDescription: text field
</del><ins>+ AXRoleDescription: date field
</ins><span class="cx">
</span><span class="cx"> input[type='datetime']
</span><span class="cx"> AXRole: AXTextField
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> input[type='email']
</span><span class="cx"> AXRole: AXTextField
</span><span class="cx"> AXSubrole:
</span><del>- AXRoleDescription: text field
</del><ins>+ AXRoleDescription: email field
</ins><span class="cx">
</span><span class="cx"> input[type='file']
</span><span class="cx"> AXRole: AXButton
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> input[type='tel']
</span><span class="cx"> AXRole: AXTextField
</span><span class="cx"> AXSubrole:
</span><del>- AXRoleDescription: text field
</del><ins>+ AXRoleDescription: telephone number field
</ins><span class="cx">
</span><span class="cx"> input[type='text']
</span><span class="cx"> AXRole: AXTextField
</span><span class="lines">@@ -322,12 +322,12 @@
</span><span class="cx"> input[type='time']
</span><span class="cx"> AXRole: AXTextField
</span><span class="cx"> AXSubrole:
</span><del>- AXRoleDescription: text field
</del><ins>+ AXRoleDescription: time field
</ins><span class="cx">
</span><span class="cx"> input[type='url']
</span><span class="cx"> AXRole: AXTextField
</span><span class="cx"> AXSubrole:
</span><del>- AXRoleDescription: text field
</del><ins>+ AXRoleDescription: URL field
</ins><span class="cx">
</span><span class="cx"> input[type='week']
</span><span class="cx"> AXRole: AXTextField
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207400 => 207401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-17 03:41:01 UTC (rev 207400)
+++ trunk/Source/WebCore/ChangeLog 2016-10-17 05:58:18 UTC (rev 207401)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2016-10-16 Nan Wang <n_wang@apple.com>
+
+ AX: [Mac] roleDescription for AXTextField input types
+ https://bugs.webkit.org/show_bug.cgi?id=163419
+ <rdar://problem/28766192>
+
+ Reviewed by Darin Adler.
+
+ Provided more detailed role description for input types that
+ exposed as standard text fields on the mac.
+
+ Changes are covered in modified test expectation.
+
+ * English.lproj/Localizable.strings:
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper roleDescription]):
+ * platform/LocalizedStrings.cpp:
+ (WebCore::AXEmailFieldText):
+ (WebCore::AXTelephoneFieldText):
+ (WebCore::AXURLFieldText):
+ (WebCore::AXDateFieldText):
+ (WebCore::AXTimeFieldText):
+ * platform/LocalizedStrings.h:
+ * platform/efl/LocalizedStringsEfl.cpp:
+ (WebCore::AXEmailFieldText):
+ (WebCore::AXTelephoneFieldText):
+ (WebCore::AXURLFieldText):
+ (WebCore::AXDateFieldText):
+ (WebCore::AXTimeFieldText):
+ * platform/gtk/LocalizedStringsGtk.cpp:
+ (WebCore::AXEmailFieldText):
+ (WebCore::AXTelephoneFieldText):
+ (WebCore::AXURLFieldText):
+ (WebCore::AXDateFieldText):
+ (WebCore::AXTimeFieldText):
+
</ins><span class="cx"> 2016-10-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Update WebKit localizable strings
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojLocalizablestrings"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (207400 => 207401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/Localizable.strings 2016-10-17 03:41:01 UTC (rev 207400)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2016-10-17 05:58:18 UTC (rev 207401)
</span><span class="lines">@@ -217,6 +217,9 @@
</span><span class="cx"> /* Undo action name */
</span><span class="cx"> "Cut (Undo action name)" = "Cut";
</span><span class="cx">
</span><ins>+/* accessibility role description for a date field */
+"date field" = "date field";
+
</ins><span class="cx"> /* Default writing direction context menu item */
</span><span class="cx"> "Default" = "Default";
</span><span class="cx">
</span><span class="lines">@@ -244,6 +247,9 @@
</span><span class="cx"> /* Undo action name */
</span><span class="cx"> "Drag (Undo action name)" = "Drag";
</span><span class="cx">
</span><ins>+/* accessibility role description for an email field */
+"email field" = "email field";
+
</ins><span class="cx"> /* Video Enter Fullscreen context menu item */
</span><span class="cx"> "Enter Full Screen" = "Enter Full Screen";
</span><span class="cx">
</span><span class="lines">@@ -613,6 +619,9 @@
</span><span class="cx"> /* File Upload alert sheet camera button string for taking only videos */
</span><span class="cx"> "Take Video (file upload action sheet)" = "Take Video";
</span><span class="cx">
</span><ins>+/* accessibility role description for a telephone number field */
+"telephone number field" = "telephone number field";
+
</ins><span class="cx"> /* Text Replacement context menu item */
</span><span class="cx"> "Text Replacement" = "Text Replacement";
</span><span class="cx">
</span><span class="lines">@@ -1087,6 +1096,9 @@
</span><span class="cx"> /* term word of a description list */
</span><span class="cx"> "term" = "term";
</span><span class="cx">
</span><ins>+/* accessibility role description for a time field */
+"time field" = "time field";
+
</ins><span class="cx"> /* accessibility label for timeline thumb */
</span><span class="cx"> "timeline slider thumb" = "timeline slider thumb";
</span><span class="cx">
</span><span class="lines">@@ -1132,6 +1144,9 @@
</span><span class="cx"> /* HTTP result code string */
</span><span class="cx"> "unsupported version" = "unsupported version";
</span><span class="cx">
</span><ins>+/* accessibility role description for a URL field */
+"URL field" = "URL field";
+
</ins><span class="cx"> /* Validation message for required form control elements that have no value */
</span><span class="cx"> "value missing" = "value missing";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (207400 => 207401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2016-10-17 03:41:01 UTC (rev 207400)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2016-10-17 05:58:18 UTC (rev 207401)
</span><span class="lines">@@ -2516,6 +2516,26 @@
</span><span class="cx"> if ([axRole isEqualToString:@"AXHeading"])
</span><span class="cx"> return AXHeadingText();
</span><span class="cx">
</span><ins>+ if ([axRole isEqualToString:NSAccessibilityTextFieldRole]) {
+ auto* node = m_object->node();
+ if (is<HTMLInputElement>(node)) {
+ auto& input = downcast<HTMLInputElement>(*node);
+ if (input.isEmailField())
+ return AXEmailFieldText();
+ if (input.isTelephoneField())
+ return AXTelephoneFieldText();
+ if (input.isURLField())
+ return AXURLFieldText();
+
+ // These input types are not enabled on mac yet, we check the type attribute for now.
+ auto& type = input.attributeWithoutSynchronization(typeAttr);
+ if (equalLettersIgnoringASCIICase(type, "date"))
+ return AXDateFieldText();
+ if (equalLettersIgnoringASCIICase(type, "time"))
+ return AXTimeFieldText();
+ }
+ }
+
</ins><span class="cx"> if (m_object->isFileUploadButton())
</span><span class="cx"> return AXFileUploadButtonText();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLocalizedStringscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (207400 => 207401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LocalizedStrings.cpp 2016-10-17 03:41:01 UTC (rev 207400)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp 2016-10-17 05:58:18 UTC (rev 207401)
</span><span class="lines">@@ -640,6 +640,31 @@
</span><span class="cx"> return WEB_UI_STRING("figure", "accessibility role description for a figure element.");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String AXEmailFieldText()
+{
+ return WEB_UI_STRING("email field", "accessibility role description for an email field.");
+}
+
+String AXTelephoneFieldText()
+{
+ return WEB_UI_STRING("telephone number field", "accessibility role description for a telephone number field.");
+}
+
+String AXURLFieldText()
+{
+ return WEB_UI_STRING("URL field", "accessibility role description for a URL field.");
+}
+
+String AXDateFieldText()
+{
+ return WEB_UI_STRING("date field", "accessibility role description for a date field.");
+}
+
+String AXTimeFieldText()
+{
+ return WEB_UI_STRING("time field", "accessibility role description for a time field.");
+}
+
</ins><span class="cx"> String AXButtonActionVerb()
</span><span class="cx"> {
</span><span class="cx"> return WEB_UI_STRING("press", "Verb stating the action that will occur when a button is pressed, as used by accessibility");
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLocalizedStringsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LocalizedStrings.h (207400 => 207401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LocalizedStrings.h 2016-10-17 03:41:01 UTC (rev 207400)
+++ trunk/Source/WebCore/platform/LocalizedStrings.h 2016-10-17 05:58:18 UTC (rev 207401)
</span><span class="lines">@@ -171,6 +171,11 @@
</span><span class="cx"> String AXDetailsText();
</span><span class="cx"> String AXSummaryText();
</span><span class="cx"> String AXFigureText();
</span><ins>+ String AXEmailFieldText();
+ String AXTelephoneFieldText();
+ String AXURLFieldText();
+ String AXDateFieldText();
+ String AXTimeFieldText();
</ins><span class="cx">
</span><span class="cx"> String AXButtonActionVerb();
</span><span class="cx"> String AXRadioButtonActionVerb();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflLocalizedStringsEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp (207400 => 207401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp 2016-10-17 03:41:01 UTC (rev 207400)
+++ trunk/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp 2016-10-17 05:58:18 UTC (rev 207401)
</span><span class="lines">@@ -413,6 +413,31 @@
</span><span class="cx"> return String::fromUTF8("figure");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String AXEmailFieldText()
+{
+ return String::fromUTF8("email field");
+}
+
+String AXTelephoneFieldText()
+{
+ return String::fromUTF8("telephone number field");
+}
+
+String AXURLFieldText()
+{
+ return String::fromUTF8("URL field");
+}
+
+String AXDateFieldText()
+{
+ return String::fromUTF8("date field");
+}
+
+String AXTimeFieldText()
+{
+ return String::fromUTF8("time field");
+}
+
</ins><span class="cx"> String AXFooterRoleDescriptionText()
</span><span class="cx"> {
</span><span class="cx"> return String::fromUTF8("footer");
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkLocalizedStringsGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp (207400 => 207401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-10-17 03:41:01 UTC (rev 207400)
+++ trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-10-17 05:58:18 UTC (rev 207401)
</span><span class="lines">@@ -461,6 +461,31 @@
</span><span class="cx"> return String::fromUTF8(_("figure"));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String AXEmailFieldText()
+{
+ return String::fromUTF8(_("email field"));
+}
+
+String AXTelephoneFieldText()
+{
+ return String::fromUTF8(_("telephone number field"));
+}
+
+String AXURLFieldText()
+{
+ return String::fromUTF8(_("URL field"));
+}
+
+String AXDateFieldText()
+{
+ return String::fromUTF8(_("date field"));
+}
+
+String AXTimeFieldText()
+{
+ return String::fromUTF8(_("time field"));
+}
+
</ins><span class="cx"> String AXFooterRoleDescriptionText()
</span><span class="cx"> {
</span><span class="cx"> return String::fromUTF8(_("footer"));
</span></span></pre>
</div>
</div>
</body>
</html>