<!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>[198474] 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/198474">198474</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2016-03-20 08:21:33 -0700 (Sun, 20 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Radio button members are not identified together in all cases
https://bugs.webkit.org/show_bug.cgi?id=155604
<rdar://problem/21186992>
Reviewed by Darin Adler.
Source/WebCore:
Allow aria radio buttons to be grouped together as linked ui elements even if they're not input types of radio button.
Modified test: accessibility/radio-button-group-members.html
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::speakProperty):
(WebCore::AccessibilityRenderObject::addRadioButtonGroupChildren):
(WebCore::AccessibilityRenderObject::addRadioButtonGroupMembers):
* accessibility/AccessibilityRenderObject.h:
LayoutTests:
* accessibility/mac/radio-button-group-members-expected.txt: Added.
* accessibility/radio-button-group-members.html:
* platform/mac/accessibility/radio-button-group-members-expected.txt: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilityradiobuttongroupmembershtml">trunk/LayoutTests/accessibility/radio-button-group-members.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjecth">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitymacradiobuttongroupmembersexpectedtxt">trunk/LayoutTests/accessibility/mac/radio-button-group-members-expected.txt</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityradiobuttongroupmembersexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/radio-button-group-members-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198473 => 198474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-20 01:57:33 UTC (rev 198473)
+++ trunk/LayoutTests/ChangeLog 2016-03-20 15:21:33 UTC (rev 198474)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-20 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Radio button members are not identified together in all cases
+ https://bugs.webkit.org/show_bug.cgi?id=155604
+ <rdar://problem/21186992>
+
+ Reviewed by Darin Adler.
+
+ * accessibility/mac/radio-button-group-members-expected.txt: Added.
+ * accessibility/radio-button-group-members.html:
+ * platform/mac/accessibility/radio-button-group-members-expected.txt: Removed.
+
</ins><span class="cx"> 2016-03-19 Skachkov Oleksandr <gskachkov@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Arrow function syntax. Update syntax error text 'super is only valid inside functions' to more suitable
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacradiobuttongroupmembersexpectedtxtfromrev198473trunkLayoutTestsplatformmacaccessibilityradiobuttongroupmembersexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/accessibility/mac/radio-button-group-members-expected.txt (from rev 198473, trunk/LayoutTests/platform/mac/accessibility/radio-button-group-members-expected.txt) (0 => 198474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/radio-button-group-members-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/mac/radio-button-group-members-expected.txt 2016-03-20 15:21:33 UTC (rev 198474)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+This tests that linked UI elements withing a radio group work
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Radio buttons within the same named group should be able to access their siblings
+PASS test1.linkedUIElementAtIndex(0).isEqual(test1) is true
+PASS test1.linkedUIElementAtIndex(1).isEqual(accessibilityController.accessibleElementById('test1_No')) is true
+PASS test1.linkedUIElementAtIndex(2).isEqual(accessibilityController.accessibleElementById('test1_Maybe')) is true
+
+
+Radio buttons that are not in a form, but in the same named group should be able to access their siblings
+PASS test2.linkedUIElementAtIndex(0).isEqual(test2) is true
+PASS test2.linkedUIElementAtIndex(1).isEqual(accessibilityController.accessibleElementById('test2_No')) is true
+
+
+Radio buttons labeled by should be able to access their siblings
+PASS test3.linkedUIElementAtIndex(0).isEqual(test3) is true
+PASS test3.linkedUIElementAtIndex(1).isEqual(accessibilityController.accessibleElementById('test3_No')) is true
+
+
+Radio buttons not in a groups should not have siblings (the first linked element is itself)
+PASS test4.linkedUIElementAtIndex(0).isEqual(test4) is true
+PASS !test4.linkedUIElementAtIndex(1) || !test4.linkedUIElementAtIndex(1).isValid is true
+
+
+Radio buttons that just have aria roles should work.
+PASS ariaRadio1.linkedUIElementAtIndex(0).isEqual(ariaRadio1) is true
+PASS ariaRadio1.linkedUIElementAtIndex(1).isEqual(ariaRadio2) is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilityradiobuttongroupmembershtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/radio-button-group-members.html (198473 => 198474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/radio-button-group-members.html 2016-03-20 01:57:33 UTC (rev 198473)
+++ trunk/LayoutTests/accessibility/radio-button-group-members.html 2016-03-20 15:21:33 UTC (rev 198474)
</span><span class="lines">@@ -35,8 +35,17 @@
</span><span class="cx"> </form>
</span><span class="cx"> <br><br>
</span><span class="cx">
</span><ins>+ <!-- Test radiogroup parentage -->
+ <div class="radiogroup" role="radiogroup" id="radiogroup">
+ <div>
+ <div role="radio" id="ariaradio1" aria-checked="true">Radio 1</div>
+ <div role="radio" id="ariaradio2" aria-checked="false">Radio 2</div>
+ <div role="radio" aria-checked="false">Radio 3</div>
</ins><span class="cx"> </div>
</span><ins>+ </div>
</ins><span class="cx">
</span><ins>+ </div>
+
</ins><span class="cx"> <p id="description"></p>
</span><span class="cx"> <div id="console"></div>
</span><span class="cx">
</span><span class="lines">@@ -69,6 +78,13 @@
</span><span class="cx"> var test4 = accessibilityController.accessibleElementById("test4_Yes");
</span><span class="cx"> shouldBeTrue("test4.linkedUIElementAtIndex(0).isEqual(test4)");
</span><span class="cx"> shouldBeTrue("!test4.linkedUIElementAtIndex(1) || !test4.linkedUIElementAtIndex(1).isValid");
</span><ins>+ debug("\n");
+
+ debug("Radio buttons that just have aria roles should work.");
+ var ariaRadio1 = accessibilityController.accessibleElementById("ariaradio1");
+ var ariaRadio2 = accessibilityController.accessibleElementById("ariaradio2");
+ shouldBeTrue("ariaRadio1.linkedUIElementAtIndex(0).isEqual(ariaRadio1)");
+ shouldBeTrue("ariaRadio1.linkedUIElementAtIndex(1).isEqual(ariaRadio2)");
</ins><span class="cx">
</span><span class="cx"> document.getElementById("content").style.visibility = "hidden";
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityradiobuttongroupmembersexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac/accessibility/radio-button-group-members-expected.txt (198473 => 198474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/radio-button-group-members-expected.txt 2016-03-20 01:57:33 UTC (rev 198473)
+++ trunk/LayoutTests/platform/mac/accessibility/radio-button-group-members-expected.txt 2016-03-20 15:21:33 UTC (rev 198474)
</span><span class="lines">@@ -1,45 +0,0 @@
</span><del>-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-This tests that linked UI elements withing a radio group work
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Radio buttons within the same named group should be able to access their siblings
-PASS test1.linkedUIElementAtIndex(0).isEqual(test1) is true
-PASS test1.linkedUIElementAtIndex(1).isEqual(accessibilityController.accessibleElementById('test1_No')) is true
-PASS test1.linkedUIElementAtIndex(2).isEqual(accessibilityController.accessibleElementById('test1_Maybe')) is true
-
-
-Radio buttons that are not in a form, but in the same named group should be able to access their siblings
-PASS test2.linkedUIElementAtIndex(0).isEqual(test2) is true
-PASS test2.linkedUIElementAtIndex(1).isEqual(accessibilityController.accessibleElementById('test2_No')) is true
-
-
-Radio buttons labeled by should be able to access their siblings
-PASS test3.linkedUIElementAtIndex(0).isEqual(test3) is true
-PASS test3.linkedUIElementAtIndex(1).isEqual(accessibilityController.accessibleElementById('test3_No')) is true
-
-
-Radio buttons not in a groups should not have siblings (the first linked element is itself)
-PASS test4.linkedUIElementAtIndex(0).isEqual(test4) is true
-PASS !test4.linkedUIElementAtIndex(1) || !test4.linkedUIElementAtIndex(1).isValid is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198473 => 198474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-20 01:57:33 UTC (rev 198473)
+++ trunk/Source/WebCore/ChangeLog 2016-03-20 15:21:33 UTC (rev 198474)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-03-20 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Radio button members are not identified together in all cases
+ https://bugs.webkit.org/show_bug.cgi?id=155604
+ <rdar://problem/21186992>
+
+ Reviewed by Darin Adler.
+
+ Allow aria radio buttons to be grouped together as linked ui elements even if they're not input types of radio button.
+
+ Modified test: accessibility/radio-button-group-members.html
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::speakProperty):
+ (WebCore::AccessibilityRenderObject::addRadioButtonGroupChildren):
+ (WebCore::AccessibilityRenderObject::addRadioButtonGroupMembers):
+ * accessibility/AccessibilityRenderObject.h:
+
</ins><span class="cx"> 2016-03-19 Joonghun Park <jh718.park@samsung.com>
</span><span class="cx">
</span><span class="cx"> Purge PassRefPtr from WebCore/html/shadow
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (198473 => 198474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-03-20 01:57:33 UTC (rev 198473)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-03-20 15:21:33 UTC (rev 198474)
</span><span class="lines">@@ -949,29 +949,44 @@
</span><span class="cx"> return m_renderer->style().speak();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AccessibilityRenderObject::addRadioButtonGroupChildren(AccessibilityObject* parent, AccessibilityChildrenVector& linkedUIElements) const
+{
+ for (const auto& child : parent->children()) {
+ if (child->roleValue() == RadioButtonRole)
+ linkedUIElements.append(child);
+ else
+ addRadioButtonGroupChildren(child.get(), linkedUIElements);
+ }
+}
+
</ins><span class="cx"> void AccessibilityRenderObject::addRadioButtonGroupMembers(AccessibilityChildrenVector& linkedUIElements) const
</span><span class="cx"> {
</span><del>- if (!m_renderer || roleValue() != RadioButtonRole)
</del><ins>+ if (roleValue() != RadioButtonRole)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- Node* node = m_renderer->node();
- if (!is<HTMLInputElement>(node))
- return;
-
- HTMLInputElement& input = downcast<HTMLInputElement>(*node);
- // if there's a form, then this is easy
- if (input.form()) {
- for (auto& associateElement : input.form()->namedElements(input.name())) {
- if (AccessibilityObject* object = axObjectCache()->getOrCreate(&associateElement.get()))
- linkedUIElements.append(object);
- }
- } else {
- for (auto& associateElement : descendantsOfType<HTMLInputElement>(node->document())) {
- if (associateElement.isRadioButton() && associateElement.name() == input.name()) {
- if (AccessibilityObject* object = axObjectCache()->getOrCreate(&associateElement))
</del><ins>+ Node* node = this->node();
+ if (is<HTMLInputElement>(node)) {
+ HTMLInputElement& input = downcast<HTMLInputElement>(*node);
+ // if there's a form, then this is easy
+ if (input.form()) {
+ for (auto& associateElement : input.form()->namedElements(input.name())) {
+ if (AccessibilityObject* object = axObjectCache()->getOrCreate(&associateElement.get()))
</ins><span class="cx"> linkedUIElements.append(object);
</span><span class="cx"> }
</span><ins>+ } else {
+ for (auto& associateElement : descendantsOfType<HTMLInputElement>(node->document())) {
+ if (associateElement.isRadioButton() && associateElement.name() == input.name()) {
+ if (AccessibilityObject* object = axObjectCache()->getOrCreate(&associateElement))
+ linkedUIElements.append(object);
+ }
+ }
</ins><span class="cx"> }
</span><ins>+ } else {
+ // If we didn't find any radio button siblings with the traditional naming, lets search for a radio group role and find its children.
+ for (AccessibilityObject* parent = parentObject(); parent; parent = parent->parentObject()) {
+ if (parent->roleValue() == RadioGroupRole)
+ addRadioButtonGroupChildren(parent, linkedUIElements);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h (198473 => 198474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2016-03-20 01:57:33 UTC (rev 198473)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2016-03-20 15:21:33 UTC (rev 198474)
</span><span class="lines">@@ -235,6 +235,7 @@
</span><span class="cx"> bool isTabItemSelected() const;
</span><span class="cx"> LayoutRect checkboxOrRadioRect() const;
</span><span class="cx"> void addRadioButtonGroupMembers(AccessibilityChildrenVector& linkedUIElements) const;
</span><ins>+ void addRadioButtonGroupChildren(AccessibilityObject*, AccessibilityChildrenVector&) const;
</ins><span class="cx"> AccessibilityObject* internalLinkElement() const;
</span><span class="cx"> AccessibilityObject* accessibilityImageMapHitTest(HTMLAreaElement*, const IntPoint&) const;
</span><span class="cx"> AccessibilityObject* accessibilityParentForImageMap(HTMLMapElement*) const;
</span></span></pre>
</div>
</div>
</body>
</html>