<!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>[185533] 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/185533">185533</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2015-06-12 23:04:25 -0700 (Fri, 12 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX:ARIA Toggle buttons aren't properly conveyed on iOS using VoiceOver
https://bugs.webkit.org/show_bug.cgi?id=145949
Reviewed by Darin Adler.
Source/WebCore:
Expose pressed state information to the iOS platform AX API.
Test: Updated inspector-protocol/dom/getAccessibilityPropertiesForNode.html
There was a FIXME for this issue in that test: https://bugs.webkit.org/show_bug.cgi?id=129830
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::isPressed):
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::classList):
(WebCore::AccessibilityObject::supportsARIAPressed):
(WebCore::AccessibilityObject::supportsARIAExpanded):
* accessibility/AccessibilityObject.h:
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper accessibilityARIALiveRegionIsAtomic]):
(-[WebAccessibilityObjectWrapper accessibilitySupportsARIAPressed]):
(-[WebAccessibilityObjectWrapper accessibilityIsPressed]):
(-[WebAccessibilityObjectWrapper accessibilitySupportsARIAExpanded]):
LayoutTests:
* inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt:
* inspector-protocol/dom/getAccessibilityPropertiesForNode.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocoldomgetAccessibilityPropertiesForNodeexpectedtxt">trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocoldomgetAccessibilityPropertiesForNodehtml">trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode.html</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="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjecth">trunk/Source/WebCore/accessibility/AccessibilityObject.h</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 (185532 => 185533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-13 03:52:06 UTC (rev 185532)
+++ trunk/LayoutTests/ChangeLog 2015-06-13 06:04:25 UTC (rev 185533)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-06-12 Chris Fleizach <cfleizach@apple.com>
+
+ AX:ARIA Toggle buttons aren't properly conveyed on iOS using VoiceOver
+ https://bugs.webkit.org/show_bug.cgi?id=145949
+
+ Reviewed by Darin Adler.
+
+ * inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt:
+ * inspector-protocol/dom/getAccessibilityPropertiesForNode.html:
+
</ins><span class="cx"> 2015-06-12 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix minor ES6 compliance issue in RegExp.prototype.toString and optimize performance a little
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocoldomgetAccessibilityPropertiesForNodeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt (185532 => 185533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt 2015-06-13 03:52:06 UTC (rev 185532)
+++ trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt 2015-06-13 06:04:25 UTC (rev 185533)
</span><span class="lines">@@ -393,13 +393,13 @@
</span><span class="cx"> pressed: false
</span><span class="cx"> required: false
</span><span class="cx">
</span><del>-<div role="button" tabindex="0" aria-pressed="true">FIXME: Pressed is false. Expected true. http://webkit.org/b/129830</div>
</del><ins>+<div role="button" tabindex="0" aria-pressed="true">Pressed.</div>
</ins><span class="cx"> exists: true
</span><del>- label: FIXME: Pressed is false. Expected true. http://webkit.org/b/129830
</del><ins>+ label: Pressed.
</ins><span class="cx"> role:
</span><span class="cx"> focused: false
</span><span class="cx"> parentNodeId: exists
</span><del>- pressed: false
</del><ins>+ pressed: true
</ins><span class="cx"> required: false
</span><span class="cx">
</span><span class="cx"> <div role="button" tabindex="0" aria-disabled="true">disabled</div>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocoldomgetAccessibilityPropertiesForNodehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode.html (185532 => 185533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode.html 2015-06-13 03:52:06 UTC (rev 185532)
+++ trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode.html 2015-06-13 06:04:25 UTC (rev 185533)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="ex" role="button" tabindex="0"></div>
</span><span class="cx"> <div class="ex" role="button" tabindex="0" aria-disabled="true">disabled</div>
</span><del>-<div class="ex" role="button" tabindex="0" aria-pressed="true">FIXME: Pressed is false. Expected true. http://webkit.org/b/129830</div>
</del><ins>+<div class="ex" role="button" tabindex="0" aria-pressed="true">Pressed.</div>
</ins><span class="cx"> <div class="ex" role="button" tabindex="0" aria-pressed="false">Not Pressed.</div>
</span><span class="cx"> <button class="ex"></button>
</span><span class="cx"> <input class="ex" type="button">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185532 => 185533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-13 03:52:06 UTC (rev 185532)
+++ trunk/Source/WebCore/ChangeLog 2015-06-13 06:04:25 UTC (rev 185533)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-06-12 Chris Fleizach <cfleizach@apple.com>
+
+ AX:ARIA Toggle buttons aren't properly conveyed on iOS using VoiceOver
+ https://bugs.webkit.org/show_bug.cgi?id=145949
+
+ Reviewed by Darin Adler.
+
+ Expose pressed state information to the iOS platform AX API.
+
+ Test: Updated inspector-protocol/dom/getAccessibilityPropertiesForNode.html
+ There was a FIXME for this issue in that test: https://bugs.webkit.org/show_bug.cgi?id=129830
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::isPressed):
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::classList):
+ (WebCore::AccessibilityObject::supportsARIAPressed):
+ (WebCore::AccessibilityObject::supportsARIAExpanded):
+ * accessibility/AccessibilityObject.h:
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityARIALiveRegionIsAtomic]):
+ (-[WebAccessibilityObjectWrapper accessibilitySupportsARIAPressed]):
+ (-[WebAccessibilityObjectWrapper accessibilityIsPressed]):
+ (-[WebAccessibilityObjectWrapper accessibilitySupportsARIAExpanded]):
+
</ins><span class="cx"> 2015-06-12 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Purge PassRefPtr in JavaScriptCore - 2
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (185532 => 185533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2015-06-13 03:52:06 UTC (rev 185532)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2015-06-13 06:04:25 UTC (rev 185533)
</span><span class="lines">@@ -693,7 +693,8 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // If this is an ARIA button, check the aria-pressed attribute rather than node()->active()
</span><del>- if (ariaRoleAttribute() == ButtonRole) {
</del><ins>+ AccessibilityRole ariaRole = ariaRoleAttribute();
+ if (ariaRole == ButtonRole || ariaRole == ToggleButtonRole) {
</ins><span class="cx"> if (equalIgnoringCase(getAttribute(aria_pressedAttr), "true"))
</span><span class="cx"> return true;
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (185532 => 185533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-06-13 03:52:06 UTC (rev 185532)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-06-13 06:04:25 UTC (rev 185533)
</span><span class="lines">@@ -2213,6 +2213,11 @@
</span><span class="cx"> classList.append(list.item(k).string());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool AccessibilityObject::supportsARIAPressed() const
+{
+ const AtomicString& expanded = getAttribute(aria_pressedAttr);
+ return equalIgnoringCase(expanded, "true") || equalIgnoringCase(expanded, "false");
+}
</ins><span class="cx">
</span><span class="cx"> bool AccessibilityObject::supportsARIAExpanded() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (185532 => 185533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2015-06-13 03:52:06 UTC (rev 185532)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2015-06-13 06:04:25 UTC (rev 185533)
</span><span class="lines">@@ -606,6 +606,7 @@
</span><span class="cx"> bool ariaPressedIsPresent() const;
</span><span class="cx"> bool ariaIsMultiline() const;
</span><span class="cx"> String invalidStatus() const;
</span><ins>+ bool supportsARIAPressed() const;
</ins><span class="cx"> bool supportsARIAExpanded() const;
</span><span class="cx"> bool supportsChecked() const;
</span><span class="cx"> AccessibilitySortDirection sortDirection() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (185532 => 185533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2015-06-13 03:52:06 UTC (rev 185532)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2015-06-13 06:04:25 UTC (rev 185533)
</span><span class="lines">@@ -2300,6 +2300,22 @@
</span><span class="cx"> return m_object->ariaLiveRegionAtomic();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)accessibilitySupportsARIAPressed
+{
+ if (![self _prepareAccessibilityCall])
+ return NO;
+
+ return m_object->supportsARIAPressed();
+}
+
+- (BOOL)accessibilityIsPressed
+{
+ if (![self _prepareAccessibilityCall])
+ return NO;
+
+ return m_object->isPressed();
+}
+
</ins><span class="cx"> - (BOOL)accessibilitySupportsARIAExpanded
</span><span class="cx"> {
</span><span class="cx"> if (![self _prepareAccessibilityCall])
</span></span></pre>
</div>
</div>
</body>
</html>