Exposed the invalid state of form controls to the accessibility APIs.

content/browser/accessibility/browser_accessibility_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/accessibility/browser_accessibility_win.h"
 
 #include <UIAutomationClient.h>
 #include <UIAutomationCoreApi.h>
 
 #include "base/strings/string_number_conversions.h"
@@ skipping 2961 matching lines @@
           ui::AX_ATTR_UNIQUE_CELL_IDS);
       for (size_t i = 0; i < unique_cell_ids.size(); ++i) {
         if (unique_cell_ids[i] == GetId()) {
           ia2_attributes_.push_back(
               base::string16(L"table-cell-index:") + base::IntToString16(i));
         }
       }
     }
   }
 
+  // Expose invalid state for form controls and elements with aria-invalid.
+  int invalidState;

[dmazzoni, 2014/12/19 17:30:33]

nit: invalid_state (c++ files in Chromium are like google3-style)

+  if (GetIntAttribute(ui::AX_ATTR_INVALID_STATE, &invalidState)) {
+    // TODO(nektar): Handle the possibility of having multiple aria-invalid
+    // attributes defined, e.g., "invalid:spelling,grammar".
+    switch (invalidState) {
+      case ui::AX_INVALID_STATE_NONE:
+        break;
+      case ui::AX_INVALID_STATE_FALSE:
+        ia2_attributes_.push_back(L"invalid:false");
+        break;
+      case ui::AX_INVALID_STATE_TRUE:
+        ia2_attributes_.push_back(L"invalid:true");
+        break;
+      case ui::AX_INVALID_STATE_SPELLING:
+        ia2_attributes_.push_back(L"invalid:spelling");
+        break;
+      case ui::AX_INVALID_STATE_GRAMMAR:
+        ia2_attributes_.push_back(L"invalid:grammar");
+        break;
+      case ui::AX_INVALID_STATE_OTHER:
+        {
+          base::string16 ariaInvalidValue;
+          if (GetString16Attribute(ui::AX_ATTR_ARIA_INVALID_VALUE,

[dmazzoni, 2014/12/19 17:30:33]

nit: you need braces for both the "if" and "else" blocks because the else spans
multiple lines

+                                   &ariaInvalidValue))
+              ia2_attributes_.push_back(L"invalid:" + ariaInvalidValue);

[dmazzoni, 2014/12/19 17:30:33]

nit: indent 2 less

+          else
+              // Set the attribute to L"true", since we cannot be more specific.
+              ia2_attributes_.push_back(L"invalid:true");

[dmazzoni, 2014/12/19 17:30:33]

nit: indent 2 less

+        }
+        break;
+      default:
+        NOTREACHED();
+    }
+  }
+
   // The calculation of the accessible name of an element has been
   // standardized in the HTML to Platform Accessibility APIs Implementation
   // Guide (http://www.w3.org/TR/html-aapi/). In order to return the
   // appropriate accessible name on Windows, we need to apply some logic
   // to the fields we get from WebKit.
   //
   // TODO(dmazzoni): move most of this logic into WebKit.
   //
   // WebKit gives us:
   //
@@ skipping 286 matching lines @@
     LONG* offset) {
   if (*offset == IA2_TEXT_OFFSET_LENGTH)
     *offset = static_cast<LONG>(text.size());
   else if (*offset == IA2_TEXT_OFFSET_CARET)
     get_caretOffset(offset);
 }
 
 ui::TextBoundaryType BrowserAccessibilityWin::IA2TextBoundaryToTextBoundary(
     IA2TextBoundaryType ia2_boundary) {
   switch(ia2_boundary) {
-    case IA2_TEXT_BOUNDARY_CHAR: return ui::CHAR_BOUNDARY;
-    case IA2_TEXT_BOUNDARY_WORD: return ui::WORD_BOUNDARY;
-    case IA2_TEXT_BOUNDARY_LINE: return ui::LINE_BOUNDARY;
-    case IA2_TEXT_BOUNDARY_SENTENCE: return ui::SENTENCE_BOUNDARY;
-    case IA2_TEXT_BOUNDARY_PARAGRAPH: return ui::PARAGRAPH_BOUNDARY;
-    case IA2_TEXT_BOUNDARY_ALL: return ui::ALL_BOUNDARY;
+    case IA2_TEXT_BOUNDARY_CHAR:
+      return ui::CHAR_BOUNDARY;
+    case IA2_TEXT_BOUNDARY_WORD:
+      return ui::WORD_BOUNDARY;
+    case IA2_TEXT_BOUNDARY_LINE:
+      return ui::LINE_BOUNDARY;
+    case IA2_TEXT_BOUNDARY_SENTENCE:
+      return ui::SENTENCE_BOUNDARY;
+    case IA2_TEXT_BOUNDARY_PARAGRAPH:
+      return ui::PARAGRAPH_BOUNDARY;
+    case IA2_TEXT_BOUNDARY_ALL:
+      return ui::ALL_BOUNDARY;
     default:
       NOTREACHED();
-      return ui::CHAR_BOUNDARY;
   }
+  return ui::CHAR_BOUNDARY;
 }
 
 LONG BrowserAccessibilityWin::FindBoundary(
     const base::string16& text,
     IA2TextBoundaryType ia2_boundary,
     LONG start_offset,
     ui::TextBoundaryDirection direction) {
   HandleSpecialTextOffset(text, &start_offset);
   ui::TextBoundaryType boundary = IA2TextBoundaryToTextBoundary(ia2_boundary);
   const std::vector<int32>& line_breaks = GetIntListAttribute(
@@ skipping 20 matching lines @@
   if (HasState(ui::AX_STATE_EXPANDED))
     ia_state_ |= STATE_SYSTEM_EXPANDED;
   if (HasState(ui::AX_STATE_FOCUSABLE))
     ia_state_ |= STATE_SYSTEM_FOCUSABLE;
   if (HasState(ui::AX_STATE_HASPOPUP))
     ia_state_ |= STATE_SYSTEM_HASPOPUP;
   if (HasState(ui::AX_STATE_HOVERED))
     ia_state_ |= STATE_SYSTEM_HOTTRACKED;
   if (HasState(ui::AX_STATE_INDETERMINATE))
     ia_state_ |= STATE_SYSTEM_INDETERMINATE;
+  if (HasIntAttribute(ui::AX_ATTR_INVALID_STATE) &&
+      GetIntAttribute(ui::AX_ATTR_INVALID_STATE) != ui::AX_INVALID_STATE_FALSE)
+      ia2_state_ |= IA2_STATE_INVALID_ENTRY;

[dmazzoni, 2014/12/19 17:30:34]

nit: indent 2 less

   if (HasState(ui::AX_STATE_INVISIBLE))
     ia_state_ |= STATE_SYSTEM_INVISIBLE;
   if (HasState(ui::AX_STATE_LINKED))
     ia_state_ |= STATE_SYSTEM_LINKED;
   if (HasState(ui::AX_STATE_MULTISELECTABLE)) {
     ia_state_ |= STATE_SYSTEM_EXTSELECTABLE;
     ia_state_ |= STATE_SYSTEM_MULTISELECTABLE;
   }
   // TODO(ctguil): Support STATE_SYSTEM_EXTSELECTABLE/accSelect.
   if (HasState(ui::AX_STATE_OFFSCREEN))
@@ skipping 18 matching lines @@
     ia2_state_ |= IA2_STATE_HORIZONTAL;
   if (HasState(ui::AX_STATE_VISITED))
     ia_state_ |= STATE_SYSTEM_TRAVERSED;
 
   // WebKit marks everything as readonly unless it's editable text, so if it's
   // not readonly, mark it as editable now. The final computation of the
   // READONLY state for MSAA is below, after the switch.
   if (!HasState(ui::AX_STATE_READ_ONLY))
     ia2_state_ |= IA2_STATE_EDITABLE;
 
-  base::string16 invalid;
-  if (GetHtmlAttribute("aria-invalid", &invalid))
-    ia2_state_ |= IA2_STATE_INVALID_ENTRY;
-
   if (GetBoolAttribute(ui::AX_ATTR_BUTTON_MIXED))
     ia_state_ |= STATE_SYSTEM_MIXED;
 
   if (GetBoolAttribute(ui::AX_ATTR_CAN_SET_VALUE))
     ia2_state_ |= IA2_STATE_EDITABLE;
 
   if (!GetStringAttribute(ui::AX_ATTR_AUTO_COMPLETE).empty())
     ia2_state_ |= IA2_STATE_SUPPORTS_AUTOCOMPLETION;
 
   base::string16 html_tag = GetString16Attribute(
@@ skipping 441 matching lines @@
   // The role should always be set.
   DCHECK(!role_name_.empty() || ia_role_);
 
   // If we didn't explicitly set the IAccessible2 role, make it the same
   // as the MSAA role.
   if (!ia2_role_)
     ia2_role_ = ia_role_;
 }
 
 }  // namespace content