<!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>[165656] 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/165656">165656</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-14 15:02:00 -0700 (Fri, 14 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>AX: AccessibilityObject::invalidStatus() is incorrect when aria-invalid=&quot;undefined&quot; or whitespace
https://bugs.webkit.org/show_bug.cgi?id=130071

Patch by James Craig &lt;jcraig@apple.com&gt; on 2014-03-14
Reviewed by Chris Fleizach.

Accounted for whitespace values and the explicit string, &quot;undefined&quot;.

Source/WebCore:

Test: accessibility/aria-invalid.html

* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::invalidStatus):
* accessibility/AccessibilityObject.h:
* accessibility/atk/WebKitAccessibleInterfaceText.cpp:
(getAttributeSetForAccessibilityObject):

LayoutTests:

* accessibility/aria-invalid-expected.txt:
* accessibility/aria-invalid.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilityariainvalidexpectedtxt">trunk/LayoutTests/accessibility/aria-invalid-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityariainvalidhtml">trunk/LayoutTests/accessibility/aria-invalid.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceTextcpp">trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165655 => 165656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-03-14 21:58:35 UTC (rev 165655)
+++ trunk/LayoutTests/ChangeLog        2014-03-14 22:02:00 UTC (rev 165656)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-03-14  James Craig  &lt;jcraig@apple.com&gt;
+
+        AX: AccessibilityObject::invalidStatus() is incorrect when aria-invalid=&quot;undefined&quot; or whitespace
+        https://bugs.webkit.org/show_bug.cgi?id=130071
+
+        Reviewed by Chris Fleizach.
+
+        Accounted for whitespace values and the explicit string, &quot;undefined&quot;.
+
+        * accessibility/aria-invalid-expected.txt:
+        * accessibility/aria-invalid.html:
+
</ins><span class="cx"> 2014-03-14  Bear Travis  &lt;betravis@adobe.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [CSS Shapes] CSS parser accepts trailing position arguments
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityariainvalidexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/aria-invalid-expected.txt (165655 => 165656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/aria-invalid-expected.txt        2014-03-14 21:58:35 UTC (rev 165655)
+++ trunk/LayoutTests/accessibility/aria-invalid-expected.txt        2014-03-14 22:02:00 UTC (rev 165656)
</span><span class="lines">@@ -1,17 +1,29 @@
</span><del>-      
</del><span class="cx"> This tests that aria-invalid causes the right attribute to be returned and it ensures a notification is sent when it changes.
</span><span class="cx"> 
</span><span class="cx"> On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-PASS accessibilityController.focusedElement.stringAttributeValue('AXInvalid') is 'true'
-PASS accessibilityController.focusedElement.stringAttributeValue('AXInvalid') is 'grammar'
-PASS accessibilityController.focusedElement.stringAttributeValue('AXInvalid') is 'spelling'
-PASS accessibilityController.focusedElement.stringAttributeValue('AXInvalid') is 'true'
-PASS accessibilityController.focusedElement.stringAttributeValue('AXInvalid') is 'false'
-PASS accessibilityController.focusedElement.stringAttributeValue('AXInvalid') is 'false'
-PASS accessibilityController.focusedElement.stringAttributeValue('AXInvalid') is 'false'
</del><ins>+PASS: AXInvalid is false.
+PASS: AXInvalid is false.
+PASS: AXInvalid is false.
+PASS: AXInvalid is false.
+PASS: AXInvalid is false.
+PASS: AXInvalid is false.
+PASS: AXInvalid is false.
+PASS: AXInvalid is false.
+PASS: AXInvalid is grammar.
+PASS: AXInvalid is grammar.
+PASS: AXInvalid is spelling.
+PASS: AXInvalid is spelling.
+PASS: AXInvalid is true.
+PASS: AXInvalid is true.
+PASS: AXInvalid is true.
+PASS: AXInvalid is true.
+PASS: AXInvalid is true.
+PASS: AXInvalid is true.
+PASS: AXInvalid is true.
</ins><span class="cx"> PASS addedNotification is true
</span><ins>+PASS: AXInvalid is spelling.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityariainvalidhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/aria-invalid.html (165655 => 165656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/aria-invalid.html        2014-03-14 21:58:35 UTC (rev 165655)
+++ trunk/LayoutTests/accessibility/aria-invalid.html        2014-03-14 22:02:00 UTC (rev 165656)
</span><span class="lines">@@ -5,15 +5,36 @@
</span><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body id=&quot;body&quot;&gt;
</span><span class="cx"> 
</span><ins>+&lt;div id=&quot;examples&quot;&gt;
+    &lt;!-- All of these eval to AXInvalid: 'false' --&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;false&quot; type=&quot;text&quot;&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;false&quot; type=&quot;text&quot; aria-invalid&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;false&quot; type=&quot;text&quot; aria-invalid=&quot;&quot;&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;false&quot; type=&quot;text&quot; aria-invalid=&quot; &quot;&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;false&quot; type=&quot;text&quot; aria-invalid=&quot;        &quot;&gt;&lt;!-- [sic] tab char --&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;false&quot; type=&quot;text&quot; aria-invalid=&quot;
+    &quot;&gt;&lt;!-- [sic] newline char --&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;false&quot; type=&quot;text&quot; aria-invalid=&quot;false&quot;&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;false&quot; type=&quot;text&quot; aria-invalid=&quot;undefined&quot;&gt;
</ins><span class="cx"> 
</span><del>-&lt;input type=&quot;text&quot; id=&quot;text1&quot; aria-invalid=&quot;true&quot;&gt;
-&lt;input type=&quot;text&quot; id=&quot;text2&quot; aria-invalid=&quot;grammar&quot;&gt;
-&lt;input type=&quot;text&quot; id=&quot;text3&quot; aria-invalid=&quot;spelling&quot;&gt;
-&lt;input type=&quot;text&quot; id=&quot;text4&quot; aria-invalid=&quot;notallowed&quot;&gt;
-&lt;input type=&quot;text&quot; id=&quot;text5&quot; aria-invalid=&quot;false&quot;&gt;
-&lt;input type=&quot;text&quot; id=&quot;text6&quot; aria-invalid=&quot;&quot;&gt;
-&lt;input type=&quot;text&quot; id=&quot;text7&quot;&gt;
</del><ins>+    &lt;!-- Known token values in ARIA 1.0. --&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;grammar&quot; type=&quot;text&quot; aria-invalid=&quot;grammar&quot;&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;grammar&quot; type=&quot;text&quot; aria-invalid=&quot;grammar        &quot;&gt;&lt;!-- [sic] tab char --&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;spelling&quot; type=&quot;text&quot; aria-invalid=&quot;spelling&quot;&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;spelling&quot; type=&quot;text&quot; aria-invalid=&quot;spelling
+    &quot;&gt;&lt;!-- [sic] newline char --&gt;
</ins><span class="cx"> 
</span><ins>+    &lt;!-- All other string values are truthy, including a combination of otherwise valid tokens. --&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;true&quot; type=&quot;text&quot; aria-invalid=&quot;true&quot;&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;true&quot; type=&quot;text&quot; aria-invalid=&quot;notallowed&quot;&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;true&quot; type=&quot;text&quot; aria-invalid=&quot;…&quot;&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;true&quot; type=&quot;text&quot; aria-invalid=&quot;Ç&quot;&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;true&quot; type=&quot;text&quot; aria-invalid=&quot;spelling grammar&quot;&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;true&quot; type=&quot;text&quot; aria-invalid=&quot;spelling        grammar&quot;&gt;&lt;!-- [sic] tab char --&gt;
+    &lt;input class=&quot;ex&quot; data-expected=&quot;true&quot; type=&quot;text&quot; aria-invalid=&quot;spelling
+    grammar&quot;&gt;&lt;!-- [sic] newline char --&gt;
+&lt;/div&gt;
+
</ins><span class="cx"> &lt;p id=&quot;description&quot;&gt;&lt;/p&gt;
</span><span class="cx"> &lt;div id=&quot;console&quot;&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div id=&quot;notifications&quot;&gt;&lt;/div&gt;
</span><span class="lines">@@ -22,44 +43,47 @@
</span><span class="cx"> 
</span><span class="cx">     description(&quot;This tests that aria-invalid causes the right attribute to be returned and it ensures a notification is sent when it changes.&quot;);
</span><span class="cx"> 
</span><del>-    var notificationElement = 0;
</del><ins>+    function $(id){
+        return document.getElementById(id);
+    }
+
+    var axNotificationElement = null;
</ins><span class="cx">     function notificationCallback(notification) {
</span><span class="cx">         if (notification == &quot;AXInvalidStatusChanged&quot;) {
</span><del>-            document.getElementById(&quot;notifications&quot;).innerHTML += &quot;Notification received successfully.&quot;;
-            notificationElement.removeNotificationListener();
</del><ins>+            $(&quot;notifications&quot;).innerHTML += &quot;Notification received successfully.&quot;;
+            axNotificationElement.removeNotificationListener();
+            $(&quot;examples&quot;).hidden = true;
</ins><span class="cx">             window.testRunner.notifyDone();
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    var result = $('console');
+    function verify(value, expectation, element) {
+      if (value === expectation)
+        result.innerText += &quot;PASS: AXInvalid is &quot; + value + &quot;.\n&quot;;
+      else
+        result.innerText += &quot;FAIL: AXInvalid is &quot; + value + &quot;. Expected: &quot; + expectation + &quot;. &quot; + (element ? element.outerHTML : &quot;&quot;) + &quot;\n&quot;;
+    }
+
</ins><span class="cx">     if (window.accessibilityController) {
</span><span class="cx">         window.testRunner.waitUntilDone();
</span><span class="cx"> 
</span><del>-        document.getElementById(&quot;text1&quot;).focus();
-        shouldBe(&quot;accessibilityController.focusedElement.stringAttributeValue('AXInvalid')&quot;, &quot;'true'&quot;);
-
-        document.getElementById(&quot;text2&quot;).focus();
-        shouldBe(&quot;accessibilityController.focusedElement.stringAttributeValue('AXInvalid')&quot;, &quot;'grammar'&quot;);
-
-        document.getElementById(&quot;text3&quot;).focus();
-        shouldBe(&quot;accessibilityController.focusedElement.stringAttributeValue('AXInvalid')&quot;, &quot;'spelling'&quot;);
-
-        document.getElementById(&quot;text4&quot;).focus();
-        shouldBe(&quot;accessibilityController.focusedElement.stringAttributeValue('AXInvalid')&quot;, &quot;'true'&quot;);
-
-        document.getElementById(&quot;text5&quot;).focus();
-        shouldBe(&quot;accessibilityController.focusedElement.stringAttributeValue('AXInvalid')&quot;, &quot;'false'&quot;);
-
-        document.getElementById(&quot;text6&quot;).focus();
-        shouldBe(&quot;accessibilityController.focusedElement.stringAttributeValue('AXInvalid')&quot;, &quot;'false'&quot;);
-
-        document.getElementById(&quot;text7&quot;).focus();
-        shouldBe(&quot;accessibilityController.focusedElement.stringAttributeValue('AXInvalid')&quot;, &quot;'false'&quot;);
-
-        notificationElement = accessibilityController.focusedElement;
-        var addedNotification = notificationElement.addNotificationListener(notificationCallback);
</del><ins>+        var examples = document.querySelectorAll(&quot;.ex&quot;);
+        for (var i = 0, c = examples.length; i &lt; c; i++) {
+            var el = examples[i];
+            el.focus();
+            var expectation = el.getAttribute(&quot;data-expected&quot;);
+            var value = accessibilityController.focusedElement.stringAttributeValue('AXInvalid');
+            verify(value, expectation, el);
+        }
+        
+        var domNotificationElement = document.querySelector(&quot;.ex&quot;);
+        domNotificationElement.focus();
+        axNotificationElement = accessibilityController.focusedElement;
+        var addedNotification = axNotificationElement.addNotificationListener(notificationCallback);
</ins><span class="cx">         shouldBeTrue(&quot;addedNotification&quot;);
</span><del>-
-        document.getElementById(&quot;text7&quot;).setAttribute(&quot;aria-invalid&quot;, &quot;spelling&quot;);
</del><ins>+        domNotificationElement.setAttribute(&quot;aria-invalid&quot;, &quot;spelling&quot;);
+        verify(axNotificationElement.stringAttributeValue('AXInvalid'), &quot;spelling&quot;, domNotificationElement);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> &lt;/script&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165655 => 165656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-03-14 21:58:35 UTC (rev 165655)
+++ trunk/Source/WebCore/ChangeLog        2014-03-14 22:02:00 UTC (rev 165656)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-03-14  James Craig  &lt;jcraig@apple.com&gt;
+
+        AX: AccessibilityObject::invalidStatus() is incorrect when aria-invalid=&quot;undefined&quot; or whitespace
+        https://bugs.webkit.org/show_bug.cgi?id=130071
+
+        Reviewed by Chris Fleizach.
+
+        Accounted for whitespace values and the explicit string, &quot;undefined&quot;.
+
+        Test: accessibility/aria-invalid.html
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::invalidStatus):
+        * accessibility/AccessibilityObject.h:
+        * accessibility/atk/WebKitAccessibleInterfaceText.cpp:
+        (getAttributeSetForAccessibilityObject):
+
</ins><span class="cx"> 2014-03-14  Bear Travis  &lt;betravis@adobe.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [CSS Shapes] CSS parser accepts trailing position arguments
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (165655 => 165656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp        2014-03-14 21:58:35 UTC (rev 165655)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp        2014-03-14 22:02:00 UTC (rev 165656)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #include &quot;FrameLoader.h&quot;
</span><span class="cx"> #include &quot;FrameSelection.h&quot;
</span><span class="cx"> #include &quot;HTMLNames.h&quot;
</span><ins>+#include &quot;HTMLParserIdioms.h&quot;
</ins><span class="cx"> #include &quot;LocalizedStrings.h&quot;
</span><span class="cx"> #include &quot;MainFrame.h&quot;
</span><span class="cx"> #include &quot;MathMLNames.h&quot;
</span><span class="lines">@@ -1528,23 +1529,28 @@
</span><span class="cx">     return equalIgnoringCase(getAttribute(aria_multilineAttr), &quot;true&quot;);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-const AtomicString&amp; AccessibilityObject::invalidStatus() const
</del><ins>+String AccessibilityObject::invalidStatus() const
</ins><span class="cx"> {
</span><del>-    DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, invalidStatusFalse, (&quot;false&quot;, AtomicString::ConstructFromLiteral));
-    DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, invalidStatusTrue, (&quot;true&quot;, AtomicString::ConstructFromLiteral));
</del><ins>+    String grammarValue = ASCIILiteral(&quot;grammar&quot;);
+    String falseValue = ASCIILiteral(&quot;false&quot;);
+    String spellingValue = ASCIILiteral(&quot;spelling&quot;);
+    String trueValue = ASCIILiteral(&quot;true&quot;);
+    String undefinedValue = ASCIILiteral(&quot;undefined&quot;);
+
+    // aria-invalid can return false (default), grammar, spelling, or true.
+    String ariaInvalid = stripLeadingAndTrailingHTMLSpaces(getAttribute(aria_invalidAttr));
</ins><span class="cx">     
</span><del>-    // aria-invalid can return false (default), grammer, spelling, or true.
-    const AtomicString&amp; ariaInvalid = getAttribute(aria_invalidAttr);
-    
-    // If 'false', empty or not present, it should return false.
-    if (ariaInvalid.isEmpty() || equalIgnoringCase(ariaInvalid, invalidStatusFalse))
-        return invalidStatusFalse;
-    
-    // Only 'true', 'grammar' and 'spelling' are values recognised by the WAI-ARIA
-    // specification. Any other non empty string should be treated as 'true'.
-    if (equalIgnoringCase(ariaInvalid, &quot;spelling&quot;) || equalIgnoringCase(ariaInvalid, &quot;grammar&quot;))
-        return ariaInvalid;
-    return invalidStatusTrue;
</del><ins>+    // If &quot;false&quot;, &quot;undefined&quot; [sic, string value], empty, or missing, return &quot;false&quot;.
+    if (ariaInvalid.isEmpty() || ariaInvalid == falseValue || ariaInvalid == undefinedValue)
+        return falseValue;
+    // Besides true/false/undefined, the only tokens defined by WAI-ARIA 1.0...
+    // ...for @aria-invalid are &quot;grammar&quot; and &quot;spelling&quot;.
+    if (ariaInvalid == grammarValue)
+        return grammarValue;
+    if (ariaInvalid == spellingValue)
+        return spellingValue;
+    // Any other non empty string should be treated as &quot;true&quot;.
+    return trueValue;
</ins><span class="cx"> }
</span><span class="cx">  
</span><span class="cx"> bool AccessibilityObject::hasTagName(const QualifiedName&amp; tagName) const
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (165655 => 165656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h        2014-03-14 21:58:35 UTC (rev 165655)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h        2014-03-14 22:02:00 UTC (rev 165656)
</span><span class="lines">@@ -585,7 +585,7 @@
</span><span class="cx">     virtual bool ariaHasPopup() const { return false; }
</span><span class="cx">     virtual bool ariaPressedIsPresent() const;
</span><span class="cx">     bool ariaIsMultiline() const;
</span><del>-    virtual const AtomicString&amp; invalidStatus() const;
</del><ins>+    String invalidStatus() 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="trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp (165655 => 165656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp        2014-03-14 21:58:35 UTC (rev 165655)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp        2014-03-14 22:02:00 UTC (rev 165656)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx">     if (!language.isEmpty())
</span><span class="cx">         result = addToAtkAttributeSet(result, atk_text_attribute_get_name(ATK_TEXT_ATTR_LANGUAGE), language.utf8().data());
</span><span class="cx"> 
</span><del>-    String invalidStatus = object-&gt;invalidStatus().string();
</del><ins>+    String invalidStatus = object-&gt;invalidStatus();
</ins><span class="cx">     if (invalidStatus != &quot;false&quot;) {
</span><span class="cx">         // Register the custom attribute for 'aria-invalid' if not done yet.
</span><span class="cx">         if (atkTextAttributeInvalid == ATK_TEXT_ATTR_INVALID)
</span></span></pre>
</div>
</div>

</body>
</html>