Chromium side Implementation of new roles added in ARIA 1.1 draft.

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 3843 matching lines @@
     case ui::AX_ROLE_IMAGE_MAP_LINK:
       ia_role = ROLE_SYSTEM_LINK;
       ia_state |= STATE_SYSTEM_LINKED;
       ia_state |= STATE_SYSTEM_READONLY;
       break;
     case ui::AX_ROLE_LABEL_TEXT:
     case ui::AX_ROLE_LEGEND:
       ia_role = ROLE_SYSTEM_TEXT;
       ia2_role = IA2_ROLE_LABEL;
       break;
-    case ui::AX_ROLE_SEARCH:
-      ia_role = ROLE_SYSTEM_GROUPING;
-      ia2_role = IA2_ROLE_SECTION;
-      break;
     case ui::AX_ROLE_LINK:
       ia_role = ROLE_SYSTEM_LINK;
       ia_state |= STATE_SYSTEM_LINKED;
       break;
     case ui::AX_ROLE_LIST:
       ia_role = ROLE_SYSTEM_LIST;
       ia_state |= STATE_SYSTEM_READONLY;
       break;
     case ui::AX_ROLE_LIST_BOX:
       ia_role = ROLE_SYSTEM_LIST;
@@ skipping 117 matching lines @@
       break;
     case ui::AX_ROLE_SCROLL_AREA:
       ia_role = ROLE_SYSTEM_CLIENT;
       ia2_role = IA2_ROLE_SCROLL_PANE;
       ia_state |= STATE_SYSTEM_READONLY;
       ia2_state &= ~(IA2_STATE_EDITABLE);
       break;
     case ui::AX_ROLE_SCROLL_BAR:
       ia_role = ROLE_SYSTEM_SCROLLBAR;
       break;
+    case ui::AX_ROLE_SEARCH:
+      ia_role = ROLE_SYSTEM_GROUPING;
+      ia2_role = IA2_ROLE_SECTION;
+      break;
     case ui::AX_ROLE_SLIDER:
       ia_role = ROLE_SYSTEM_SLIDER;
       break;
     case ui::AX_ROLE_SPIN_BUTTON:
       ia_role = ROLE_SYSTEM_SPINBUTTON;
       break;
     case ui::AX_ROLE_SPIN_BUTTON_PART:
       ia_role = ROLE_SYSTEM_PUSHBUTTON;
       break;
     case ui::AX_ROLE_ANNOTATION:
     case ui::AX_ROLE_LIST_MARKER:
     case ui::AX_ROLE_STATIC_TEXT:
       ia_role = ROLE_SYSTEM_STATICTEXT;
       break;
     case ui::AX_ROLE_STATUS:
       ia_role = ROLE_SYSTEM_STATUSBAR;
       break;
     case ui::AX_ROLE_SPLITTER:
       ia_role = ROLE_SYSTEM_SEPARATOR;
       break;
     case ui::AX_ROLE_SVG_ROOT:
       ia_role = ROLE_SYSTEM_GRAPHIC;
       break;
+    case ui::AX_ROLE_SWITCH:
+      role_name = L"switch";
+      ia2_role = IA2_ROLE_TOGGLE_BUTTON;
+      break;
     case ui::AX_ROLE_TAB:
       ia_role = ROLE_SYSTEM_PAGETAB;
       break;
     case ui::AX_ROLE_TABLE: {
       base::string16 aria_role = GetString16Attribute(
           ui::AX_ATTR_ROLE);
       if (aria_role == L"treegrid") {
         ia_role = ROLE_SYSTEM_OUTLINE;
       } else {
         ia_role = ROLE_SYSTEM_TABLE;
       }
       break;
     }
     case ui::AX_ROLE_TABLE_HEADER_CONTAINER:
       ia_role = ROLE_SYSTEM_GROUPING;
       ia2_role = IA2_ROLE_SECTION;
       ia_state |= STATE_SYSTEM_READONLY;
       break;
     case ui::AX_ROLE_TAB_LIST:
       ia_role = ROLE_SYSTEM_PAGETABLIST;
       break;
     case ui::AX_ROLE_TAB_PANEL:
       ia_role = ROLE_SYSTEM_PROPERTYPAGE;
       break;
     case ui::AX_ROLE_TOGGLE_BUTTON:
       ia_role = ROLE_SYSTEM_PUSHBUTTON;
       ia2_role = IA2_ROLE_TOGGLE_BUTTON;
       break;
     case ui::AX_ROLE_TEXT_AREA:
+    case ui::AX_ROLE_SEARCH_BOX:

[dmazzoni, 2015/03/27 05:12:05]

Maybe this should be a text field? I don't think it's typically multiline,
right?

[shreeramk, 2015/03/27 05:19:05]

But it does support aria-multiline. And superclass role is textbox which is
exposed as AX_ROLE_TEXT_AREA in AXObject.cpp

[dmazzoni, 2015/03/27 05:32:27]

In AXNodeObject::determineAriaRoleAttribute, it gets changed to TextFieldRole if
aria-multiline is false.

I think we need to fix multiline support in general, and that's beyond this
changelist.

Right now you're always mapping a search box to MULTI_LINE, and I don't think
that makes sense. Map it to SINGLE_LINE for now, that's going to be correct 99%
of the time. I filed http://crbug.com/471152 to fix the multiline issue.

       ia_role = ROLE_SYSTEM_TEXT;
       ia2_state |= IA2_STATE_MULTI_LINE;
       ia2_state |= IA2_STATE_EDITABLE;
       ia2_state |= IA2_STATE_SELECTABLE_TEXT;
       break;
     case ui::AX_ROLE_TEXT_FIELD:
       ia_role = ROLE_SYSTEM_TEXT;
       ia2_state |= IA2_STATE_SINGLE_LINE;
       ia2_state |= IA2_STATE_EDITABLE;
       ia2_state |= IA2_STATE_SELECTABLE_TEXT;
@@ skipping 65 matching lines @@
     ia2_role = ia_role;
 
   win_attributes_->ia_role = ia_role;
   win_attributes_->ia_state = ia_state;
   win_attributes_->role_name = role_name;
   win_attributes_->ia2_role = ia2_role;
   win_attributes_->ia2_state = ia2_state;
 }
 
 }  // namespace content