<!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>[160762] 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/160762">160762</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2013-12-18 06:18:41 -0800 (Wed, 18 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: HTML spec change indicates @aria-required should trump @required on any element
https://bugs.webkit.org/show_bug.cgi?id=122145
Reviewed by Mario Sanchez Prada.
Source/WebCore:
aria-required should win over the native "required" attribute.
Updated tests: accessibility/aria-required.html
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::isRequired):
LayoutTests:
* accessibility/aria-required-expected.txt:
* accessibility/aria-required.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilityariarequiredexpectedtxt">trunk/LayoutTests/accessibility/aria-required-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityariarequiredhtml">trunk/LayoutTests/accessibility/aria-required.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160761 => 160762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-18 13:56:35 UTC (rev 160761)
+++ trunk/LayoutTests/ChangeLog 2013-12-18 14:18:41 UTC (rev 160762)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-18 Chris Fleizach <cfleizach@apple.com>
+
+ AX: HTML spec change indicates @aria-required should trump @required on any element
+ https://bugs.webkit.org/show_bug.cgi?id=122145
+
+ Reviewed by Mario Sanchez Prada.
+
+ * accessibility/aria-required-expected.txt:
+ * accessibility/aria-required.html:
+
</ins><span class="cx"> 2013-12-18 Michał Pakuła vel Rutka <m.pakula@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed EFL gardening
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityariarequiredexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/aria-required-expected.txt (160761 => 160762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/aria-required-expected.txt 2013-12-18 13:56:35 UTC (rev 160761)
+++ trunk/LayoutTests/accessibility/aria-required-expected.txt 2013-12-18 14:18:41 UTC (rev 160762)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-Elements to test: 32
</del><ins>+Elements to test: 35
</ins><span class="cx">
</span><span class="cx"> PASS textfield isRequired is false
</span><span class="cx"> PASS textfield_required isRequired is true
</span><span class="lines">@@ -14,17 +14,20 @@
</span><span class="cx"> PASS checkbox_required isRequired is true
</span><span class="cx"> PASS checkbox_required_ariarequired isRequired is true
</span><span class="cx"> PASS checkbox_ariarequiredfalse isRequired is false
</span><del>-PASS checkbox_required_ariarequiredfalse isRequired is true
</del><ins>+PASS checkbox_required_ariarequiredfalse isRequired is false
+PASS checkbox_requiredfalse_ariarequiredtrue isRequired is true
</ins><span class="cx"> PASS select isRequired is false
</span><span class="cx"> PASS select_required isRequired is true
</span><span class="cx"> PASS select_required_ariarequired isRequired is true
</span><span class="cx"> PASS select_ariarequiredfalse isRequired is false
</span><del>-PASS select_required_ariarequiredfalse isRequired is true
</del><ins>+PASS select_required_ariarequiredfalse isRequired is false
+PASS select_requiredfalse_ariarequiredtrue isRequired is true
</ins><span class="cx"> PASS textarea isRequired is false
</span><span class="cx"> PASS textarea_required isRequired is true
</span><span class="cx"> PASS textarea_required_ariarequired isRequired is true
</span><span class="cx"> PASS textarea_ariarequiredfalse isRequired is false
</span><del>-PASS textarea_required_ariarequiredfalse isRequired is true
</del><ins>+PASS textarea_required_ariarequiredfalse isRequired is false
+PASS textarea_requiredfalse_ariarequiredtrue isRequired is true
</ins><span class="cx"> PASS listbox_ariarequiredtrue isRequired is true
</span><span class="cx"> PASS listbox_ariarequiredfalse isRequired is false
</span><span class="cx"> PASS listbox isRequired is false
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityariarequiredhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/aria-required.html (160761 => 160762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/aria-required.html 2013-12-18 13:56:35 UTC (rev 160761)
+++ trunk/LayoutTests/accessibility/aria-required.html 2013-12-18 14:18:41 UTC (rev 160762)
</span><span class="lines">@@ -25,11 +25,9 @@
</span><span class="cx"> <input type="checkbox" id="checkbox_required" required data-expectedrequired="true">
</span><span class="cx"> <input type="checkbox" required aria-required="true" id="checkbox_required_ariarequired" data-expectedrequired="true">
</span><span class="cx"> <input type="checkbox" aria-required="false" id="checkbox_ariarequiredfalse" data-expectedrequired="false">
</span><del>- <!-- these last ones conflict with implicit value of @required, so host language attr should win -->
- <input type="checkbox" aria-required="false" required id="checkbox_required_ariarequiredfalse" data-expectedrequired="true">
- <!-- BLOCKED by http://webkit.org/b/119988
- <input type="checkbox" aria-required="true" id="checkbox_requiredfalse_ariarequiredtrue" data-expectedrequired="false">
- -->
</del><ins>+ <!-- these last ones conflict with implicit value of @required, so ARIA should win -->
+ <input type="checkbox" aria-required="false" required id="checkbox_required_ariarequiredfalse" data-expectedrequired="false">
+ <input type="checkbox" aria-required="true" id="checkbox_requiredfalse_ariarequiredtrue" data-expectedrequired="true">
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> <!-- select -->
</span><span class="lines">@@ -37,11 +35,9 @@
</span><span class="cx"> <select id="select_required" required data-expectedrequired="true"><option>test</option></select>
</span><span class="cx"> <select required aria-required="true" id="select_required_ariarequired" data-expectedrequired="true"><option>test</option></select>
</span><span class="cx"> <select aria-required="false" id="select_ariarequiredfalse" data-expectedrequired="false"><option>test</option></select>
</span><del>- <!-- these last ones conflict with implicit value of @required, so host language attr should win -->
- <select aria-required="false" required id="select_required_ariarequiredfalse" data-expectedrequired="true"><option>test</option></select>
- <!-- BLOCKED by http://webkit.org/b/119988
- <select aria-required="true" id="select_requiredfalse_ariarequiredtrue" data-expectedrequired="false"><option>test</option></select>
- -->
</del><ins>+ <!-- these last ones conflict with implicit value of @required, so ARIA should win -->
+ <select aria-required="false" required id="select_required_ariarequiredfalse" data-expectedrequired="false"><option>test</option></select>
+ <select aria-required="true" id="select_requiredfalse_ariarequiredtrue" data-expectedrequired="true"><option>test</option></select>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> <!-- textarea -->
</span><span class="lines">@@ -49,11 +45,9 @@
</span><span class="cx"> <textarea id="textarea_required" required data-expectedrequired="true"></textarea>
</span><span class="cx"> <textarea required aria-required="true" id="textarea_required_ariarequired" data-expectedrequired="true"></textarea>
</span><span class="cx"> <textarea aria-required="false" id="textarea_ariarequiredfalse" data-expectedrequired="false"></textarea>
</span><del>- <!-- these last ones conflict with implicit value of @required, so host language attr should win -->
- <textarea aria-required="false" required id="textarea_required_ariarequiredfalse" data-expectedrequired="true"></textarea>
- <!-- BLOCKED by http://webkit.org/b/119988
- <textarea aria-required="true" id="textarea_requiredfalse_ariarequiredtrue" data-expectedrequired="false"></textarea>
- -->
</del><ins>+ <!-- these last ones conflict with implicit value of @required, so ARIA should win -->
+ <textarea aria-required="false" required id="textarea_required_ariarequiredfalse" data-expectedrequired="false"></textarea>
+ <textarea aria-required="true" id="textarea_requiredfalse_ariarequiredtrue" data-expectedrequired="true"></textarea>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> <!-- Custom ARIA controls (@required is not allowed on these elements, so no conflict resolution needed.) -->
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160761 => 160762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-18 13:56:35 UTC (rev 160761)
+++ trunk/Source/WebCore/ChangeLog 2013-12-18 14:18:41 UTC (rev 160762)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-12-18 Chris Fleizach <cfleizach@apple.com>
+
+ AX: HTML spec change indicates @aria-required should trump @required on any element
+ https://bugs.webkit.org/show_bug.cgi?id=122145
+
+ Reviewed by Mario Sanchez Prada.
+
+ aria-required should win over the native "required" attribute.
+
+ Updated tests: accessibility/aria-required.html
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::isRequired):
+
</ins><span class="cx"> 2013-12-18 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix make distcheck.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (160761 => 160762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2013-12-18 13:56:35 UTC (rev 160761)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2013-12-18 14:18:41 UTC (rev 160762)
</span><span class="lines">@@ -730,8 +730,12 @@
</span><span class="cx">
</span><span class="cx"> bool AccessibilityNodeObject::isRequired() const
</span><span class="cx"> {
</span><del>- if (equalIgnoringCase(getAttribute(aria_requiredAttr), "true"))
</del><ins>+ // Explicit aria-required values should trump native required attributes.
+ const AtomicString& requiredValue = getAttribute(aria_requiredAttr);
+ if (equalIgnoringCase(requiredValue, "true"))
</ins><span class="cx"> return true;
</span><ins>+ if (equalIgnoringCase(requiredValue, "false"))
+ return false;
</ins><span class="cx">
</span><span class="cx"> Node* n = this->node();
</span><span class="cx"> if (n && (n->isElementNode() && toElement(n)->isFormControlElement()))
</span></span></pre>
</div>
</div>
</body>
</html>