<!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>[198997] trunk/Source/WebCore</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/198997">198997</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2016-04-04 00:53:40 -0700 (Mon, 04 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Consolidate radio button group member code with that in HTMLElement derivatives
https://bugs.webkit.org/show_bug.cgi?id=155696
<rdar://problem/25260379>
Reviewed by Darin Adler.
Behavior covered by existing tests.
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::addRadioButtonGroupMembers):
* dom/CheckedRadioButtons.cpp:
(WebCore::RadioButtonGroup::isValid):
(WebCore::RadioButtonGroup::members):
(WebCore::RadioButtonGroup::setCheckedButton):
(WebCore::CheckedRadioButtons::addButton):
(WebCore::CheckedRadioButtons::groupMembers):
(WebCore::CheckedRadioButtons::updateCheckedState):
* dom/CheckedRadioButtons.h:
* dom/Range.h:
(WebCore::documentOrderComparator):
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::isInRequiredRadioButtonGroup):
(WebCore::HTMLInputElement::radioButtonGroup):
(WebCore::HTMLInputElement::checkedRadioButtonForGroup):
* html/HTMLInputElement.h:</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCoredomCheckedRadioButtonscpp">trunk/Source/WebCore/dom/CheckedRadioButtons.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCheckedRadioButtonsh">trunk/Source/WebCore/dom/CheckedRadioButtons.h</a></li>
<li><a href="#trunkSourceWebCoredomRangeh">trunk/Source/WebCore/dom/Range.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementcpp">trunk/Source/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementh">trunk/Source/WebCore/html/HTMLInputElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198996 => 198997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-04 07:42:31 UTC (rev 198996)
+++ trunk/Source/WebCore/ChangeLog 2016-04-04 07:53:40 UTC (rev 198997)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-04-04 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Consolidate radio button group member code with that in HTMLElement derivatives
+ https://bugs.webkit.org/show_bug.cgi?id=155696
+ <rdar://problem/25260379>
+
+ Reviewed by Darin Adler.
+
+ Behavior covered by existing tests.
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::addRadioButtonGroupMembers):
+ * dom/CheckedRadioButtons.cpp:
+ (WebCore::RadioButtonGroup::isValid):
+ (WebCore::RadioButtonGroup::members):
+ (WebCore::RadioButtonGroup::setCheckedButton):
+ (WebCore::CheckedRadioButtons::addButton):
+ (WebCore::CheckedRadioButtons::groupMembers):
+ (WebCore::CheckedRadioButtons::updateCheckedState):
+ * dom/CheckedRadioButtons.h:
+ * dom/Range.h:
+ (WebCore::documentOrderComparator):
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::isInRequiredRadioButtonGroup):
+ (WebCore::HTMLInputElement::radioButtonGroup):
+ (WebCore::HTMLInputElement::checkedRadioButtonForGroup):
+ * html/HTMLInputElement.h:
+
</ins><span class="cx"> 2016-04-03 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unneeded UsePointersEvenForNonNullableObjectArguments in WebKitCSSMatrix.idl
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (198996 => 198997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-04-04 07:42:31 UTC (rev 198996)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-04-04 07:53:40 UTC (rev 198997)
</span><span class="lines">@@ -967,19 +967,9 @@
</span><span class="cx"> Node* node = this->node();
</span><span class="cx"> if (is<HTMLInputElement>(node)) {
</span><span class="cx"> HTMLInputElement& input = downcast<HTMLInputElement>(*node);
</span><del>- // 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))
- linkedUIElements.append(object);
- }
- }
</del><ins>+ for (auto& radioSibling : input.radioButtonGroup()) {
+ if (AccessibilityObject* object = axObjectCache()->getOrCreate(radioSibling))
+ linkedUIElements.append(object);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // If we didn't find any radio button siblings with the traditional naming, lets search for a radio group role and find its children.
</span></span></pre></div>
<a id="trunkSourceWebCoredomCheckedRadioButtonscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CheckedRadioButtons.cpp (198996 => 198997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CheckedRadioButtons.cpp 2016-04-04 07:42:31 UTC (rev 198996)
+++ trunk/Source/WebCore/dom/CheckedRadioButtons.cpp 2016-04-04 07:53:40 UTC (rev 198997)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CheckedRadioButtons.h"
</span><ins>+#include "Range.h"
</ins><span class="cx">
</span><span class="cx"> #include "HTMLInputElement.h"
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="lines">@@ -38,7 +39,8 @@
</span><span class="cx"> void requiredAttributeChanged(HTMLInputElement*);
</span><span class="cx"> void remove(HTMLInputElement*);
</span><span class="cx"> bool contains(HTMLInputElement*) const;
</span><del>-
</del><ins>+ Vector<HTMLInputElement*> members() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> void updateValidityForAllButtons();
</span><span class="cx"> bool isValid() const;
</span><span class="lines">@@ -60,6 +62,14 @@
</span><span class="cx"> return !isRequired() || m_checkedButton;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Vector<HTMLInputElement*> RadioButtonGroup::members() const
+{
+ Vector<HTMLInputElement*> members;
+ copyToVector(m_members, members);
+ std::sort(members.begin(), members.end(), documentOrderComparator);
+ return members;
+}
+
</ins><span class="cx"> void RadioButtonGroup::setCheckedButton(HTMLInputElement* button)
</span><span class="cx"> {
</span><span class="cx"> HTMLInputElement* oldCheckedButton = m_checkedButton;
</span><span class="lines">@@ -189,6 +199,22 @@
</span><span class="cx"> group->add(element);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Vector<HTMLInputElement*> CheckedRadioButtons::groupMembers(const HTMLInputElement& element) const
+{
+ ASSERT(element.isRadioButton());
+ if (!element.isRadioButton())
+ return { };
+
+ auto* name = element.name().impl();
+ if (!name)
+ return { };
+
+ auto* group = m_nameToGroupMap->get(name);
+ if (!group)
+ return { };
+ return group->members();
+}
+
</ins><span class="cx"> void CheckedRadioButtons::updateCheckedState(HTMLInputElement* element)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(element->isRadioButton());
</span></span></pre></div>
<a id="trunkSourceWebCoredomCheckedRadioButtonsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CheckedRadioButtons.h (198996 => 198997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CheckedRadioButtons.h 2016-04-04 07:42:31 UTC (rev 198996)
+++ trunk/Source/WebCore/dom/CheckedRadioButtons.h 2016-04-04 07:53:40 UTC (rev 198997)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><ins>+#include <wtf/Vector.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -42,7 +43,8 @@
</span><span class="cx"> void removeButton(HTMLInputElement*);
</span><span class="cx"> HTMLInputElement* checkedButtonForGroup(const AtomicString& groupName) const;
</span><span class="cx"> bool isInRequiredGroup(HTMLInputElement*) const;
</span><del>-
</del><ins>+ Vector<HTMLInputElement*> groupMembers(const HTMLInputElement&) const;
+
</ins><span class="cx"> private:
</span><span class="cx"> typedef HashMap<AtomicStringImpl*, std::unique_ptr<RadioButtonGroup>> NameToGroupMap;
</span><span class="cx"> std::unique_ptr<NameToGroupMap> m_nameToGroupMap;
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.h (198996 => 198997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.h 2016-04-04 07:42:31 UTC (rev 198996)
+++ trunk/Source/WebCore/dom/Range.h 2016-04-04 07:53:40 UTC (rev 198997)
</span><span class="lines">@@ -182,6 +182,11 @@
</span><span class="cx"> WEBCORE_EXPORT bool areRangesEqual(const Range*, const Range*);
</span><span class="cx"> bool rangesOverlap(const Range*, const Range*);
</span><span class="cx">
</span><ins>+inline bool documentOrderComparator(const Node* a, const Node* b)
+{
+ return Range::compareBoundaryPoints(const_cast<Node*>(a), 0, const_cast<Node*>(b), 0, ASSERT_NO_EXCEPTION) < 0;
+}
+
</ins><span class="cx"> } // namespace
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (198996 => 198997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2016-04-04 07:42:31 UTC (rev 198996)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2016-04-04 07:53:40 UTC (rev 198997)
</span><span class="lines">@@ -1776,6 +1776,14 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Vector<HTMLInputElement*> HTMLInputElement::radioButtonGroup() const
+{
+ CheckedRadioButtons* buttons = checkedRadioButtons();
+ if (!buttons)
+ return { };
+ return buttons->groupMembers(*this);
+}
+
</ins><span class="cx"> HTMLInputElement* HTMLInputElement::checkedRadioButtonForGroup() const
</span><span class="cx"> {
</span><span class="cx"> if (CheckedRadioButtons* buttons = checkedRadioButtons())
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.h (198996 => 198997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.h 2016-04-04 07:42:31 UTC (rev 198996)
+++ trunk/Source/WebCore/html/HTMLInputElement.h 2016-04-04 07:53:40 UTC (rev 198997)
</span><span class="lines">@@ -271,6 +271,7 @@
</span><span class="cx"> void listAttributeTargetChanged();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ Vector<HTMLInputElement*> radioButtonGroup() const;
</ins><span class="cx"> HTMLInputElement* checkedRadioButtonForGroup() const;
</span><span class="cx"> bool isInRequiredRadioButtonGroup();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>