<!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>[208159] 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/208159">208159</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2016-10-31 10:18:19 -0700 (Mon, 31 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: iOS Voiceover does not announce previously selected value from input type="date" form field
https://bugs.webkit.org/show_bug.cgi?id=164176
Reviewed by Chris Fleizach.
Source/WebCore:
Input type date is a popup button on iOS and its value was not exposed in stringValue() since
it's not considered a text control. Instead, the value was exposed in AXTitle. Fixed this by adding
the case in stringValue() and removing the AXTitle exposure.
Changes are covered in modified test.
* accessibility/AccessibilityObject.h:
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::stringValue):
* accessibility/ios/AccessibilityObjectIOS.mm:
(WebCore::AccessibilityObject::isInputTypePopupButton):
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper accessibilityLabel]):
LayoutTests:
* accessibility/ios-simulator/input-type-time-expected.txt:
* accessibility/ios-simulator/input-type-time.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatorinputtypetimeexpectedtxt">trunk/LayoutTests/accessibility/ios-simulator/input-type-time-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatorinputtypetimehtml">trunk/LayoutTests/accessibility/ios-simulator/input-type-time.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreaccessibilityiosAccessibilityObjectIOSmm">trunk/Source/WebCore/accessibility/ios/AccessibilityObjectIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208158 => 208159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-31 17:16:52 UTC (rev 208158)
+++ trunk/LayoutTests/ChangeLog 2016-10-31 17:18:19 UTC (rev 208159)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-31 Nan Wang <n_wang@apple.com>
+
+ AX: iOS Voiceover does not announce previously selected value from input type="date" form field
+ https://bugs.webkit.org/show_bug.cgi?id=164176
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/ios-simulator/input-type-time-expected.txt:
+ * accessibility/ios-simulator/input-type-time.html:
+
</ins><span class="cx"> 2016-10-31 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r206300): LayoutTest media/media-source/media-source-duplicate-seeked.html timing out
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatorinputtypetimeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/ios-simulator/input-type-time-expected.txt (208158 => 208159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/input-type-time-expected.txt 2016-10-31 17:16:52 UTC (rev 208158)
+++ trunk/LayoutTests/accessibility/ios-simulator/input-type-time-expected.txt 2016-10-31 17:18:19 UTC (rev 208159)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-
</del><ins>+
</ins><span class="cx"> This tests that input type: time is accessible on iOS.
</span><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="lines">@@ -6,6 +6,9 @@
</span><span class="cx">
</span><span class="cx"> PASS timeinput.description is 'AXLabel: (Between: 07:00 AM-09:00 AM)'
</span><span class="cx"> PASS timeinput.isIgnored is false
</span><ins>+PASS timeinput.stringValue is 'AXValue: 8:00 AM'
+PASS timeinput2.description is 'AXLabel: '
+PASS timeinput2.stringValue is 'AXValue: 8:00 AM'
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatorinputtypetimehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/ios-simulator/input-type-time.html (208158 => 208159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/input-type-time.html 2016-10-31 17:16:52 UTC (rev 208158)
+++ trunk/LayoutTests/accessibility/ios-simulator/input-type-time.html 2016-10-31 17:18:19 UTC (rev 208159)
</span><span class="lines">@@ -8,7 +8,8 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body id="body">
</span><span class="cx">
</span><del>-<input id="timeinput" type="time" aria-label="(Between: 07:00 AM-09:00 AM)" min="07:00" max="09:00" step="300" placeholder="00:00 AM">
</del><ins>+<input id="timeinput" type="time" aria-label="(Between: 07:00 AM-09:00 AM)" min="07:00" max="09:00" step="300" placeholder="00:00 AM" value="08:00">
+<input id="timeinput2" type="time" min="07:00" max="09:00" step="300" value="08:00">
</ins><span class="cx">
</span><span class="cx"> <p id="description"></p>
</span><span class="cx"> <div id="console"></div>
</span><span class="lines">@@ -20,8 +21,14 @@
</span><span class="cx"> if (window.accessibilityController) {
</span><span class="cx">
</span><span class="cx"> var timeinput = accessibilityController.accessibleElementById("timeinput");
</span><ins>+ var timeinput2 = accessibilityController.accessibleElementById("timeinput2");
</ins><span class="cx"> shouldBe("timeinput.description", "'AXLabel: (Between: 07:00 AM-09:00 AM)'");
</span><span class="cx"> shouldBeFalse("timeinput.isIgnored");
</span><ins>+
+ // Test value is exposed in AXValue.
+ shouldBe("timeinput.stringValue", "'AXValue: 8:00 AM'");
+ shouldBe("timeinput2.description", "'AXLabel: '");
+ shouldBe("timeinput2.stringValue", "'AXValue: 8:00 AM'");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> successfullyParsed = true;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208158 => 208159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-31 17:16:52 UTC (rev 208158)
+++ trunk/Source/WebCore/ChangeLog 2016-10-31 17:18:19 UTC (rev 208159)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-10-31 Nan Wang <n_wang@apple.com>
+
+ AX: iOS Voiceover does not announce previously selected value from input type="date" form field
+ https://bugs.webkit.org/show_bug.cgi?id=164176
+
+ Reviewed by Chris Fleizach.
+
+ Input type date is a popup button on iOS and its value was not exposed in stringValue() since
+ it's not considered a text control. Instead, the value was exposed in AXTitle. Fixed this by adding
+ the case in stringValue() and removing the AXTitle exposure.
+
+ Changes are covered in modified test.
+
+ * accessibility/AccessibilityObject.h:
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::stringValue):
+ * accessibility/ios/AccessibilityObjectIOS.mm:
+ (WebCore::AccessibilityObject::isInputTypePopupButton):
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityLabel]):
+
</ins><span class="cx"> 2016-10-31 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add requestIdleCallback to features.json.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (208158 => 208159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2016-10-31 17:16:52 UTC (rev 208158)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2016-10-31 17:18:19 UTC (rev 208159)
</span><span class="lines">@@ -1042,6 +1042,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> int accessibilityPasswordFieldLength();
</span><span class="cx"> bool hasTouchEventListener() const;
</span><ins>+ bool isInputTypePopupButton() const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // allows for an AccessibilityObject to update its render tree or perform
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (208158 => 208159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-10-31 17:16:52 UTC (rev 208158)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-10-31 17:18:19 UTC (rev 208159)
</span><span class="lines">@@ -776,6 +776,11 @@
</span><span class="cx"> if (isTextControl())
</span><span class="cx"> return text();
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ if (isInputTypePopupButton())
+ return textUnderElement();
+#endif
+
</ins><span class="cx"> if (is<RenderFileUploadControl>(*m_renderer))
</span><span class="cx"> return downcast<RenderFileUploadControl>(*m_renderer).fileTextValue();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosAccessibilityObjectIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/AccessibilityObjectIOS.mm (208158 => 208159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/AccessibilityObjectIOS.mm 2016-10-31 17:16:52 UTC (rev 208158)
+++ trunk/Source/WebCore/accessibility/ios/AccessibilityObjectIOS.mm 2016-10-31 17:18:19 UTC (rev 208159)
</span><span class="lines">@@ -90,6 +90,13 @@
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+
+bool AccessibilityObject::isInputTypePopupButton() const
+{
+ if (is<HTMLInputElement>(node()))
+ return roleValue() == PopUpButtonRole;
+ return false;
+}
</ins><span class="cx">
</span><span class="cx"> } // WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (208158 => 208159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2016-10-31 17:16:52 UTC (rev 208158)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2016-10-31 17:18:19 UTC (rev 208159)
</span><span class="lines">@@ -997,6 +997,10 @@
</span><span class="cx"> NSString *axTitle = [self baseAccessibilityTitle];
</span><span class="cx"> NSString *axDescription = [self baseAccessibilityDescription];
</span><span class="cx"> NSString *landmarkDescription = [self ariaLandmarkRoleDescription];
</span><ins>+
+ // We should expose the value of the input type date or time through AXValue instead of AXTitle.
+ if (m_object->isInputTypePopupButton() && [axTitle isEqualToString:[self accessibilityValue]])
+ axTitle = nil;
</ins><span class="cx">
</span><span class="cx"> // Footer is not considered a landmark, but we want the role description.
</span><span class="cx"> if (m_object->roleValue() == FooterRole)
</span></span></pre>
</div>
</div>
</body>
</html>