Map a few more WebKit roles to MSAA roles - thanks to Charles...

chrome/browser/accessibility/browser_accessibility_win.cc

 // Copyright (c) 2010 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 "chrome/browser/accessibility/browser_accessibility_win.h"
 
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/accessibility/browser_accessibility_manager_win.h"
@@ skipping 1306 matching lines @@
     case WebAccessibility::ROLE_ALERT_DIALOG:
       ia_role_ = ROLE_SYSTEM_ALERT;
       break;
     case WebAccessibility::ROLE_APPLICATION:
       ia_role_ = ROLE_SYSTEM_APPLICATION;
       break;
     case WebAccessibility::ROLE_ARTICLE:
       ia_role_ = ROLE_SYSTEM_GROUPING;
       ia2_role_ = IA2_ROLE_SECTION;
       break;
+    case WebAccessibility::ROLE_BUSY_INDICATOR:
+      ia_role_ = ROLE_SYSTEM_ANIMATION;
+      break;
     case WebAccessibility::ROLE_BUTTON:
       ia_role_ = ROLE_SYSTEM_PUSHBUTTON;
       break;
     case WebAccessibility::ROLE_CELL:
       ia_role_ = ROLE_SYSTEM_CELL;
       break;
     case WebAccessibility::ROLE_CHECKBOX:
       ia_role_ = ROLE_SYSTEM_CHECKBUTTON;
       break;
     case WebAccessibility::ROLE_COLOR_WELL:
@@ skipping 12 matching lines @@
     case WebAccessibility::ROLE_DEFINITION_LIST_DEFINITION:
       GetAttribute(WebAccessibility::ATTR_HTML_TAG, &role_name_);
       ia2_role_ = IA2_ROLE_PARAGRAPH;
       break;
     case WebAccessibility::ROLE_DEFINITION_LIST_TERM:
       ia_role_ = ROLE_SYSTEM_LISTITEM;
       break;
     case WebAccessibility::ROLE_DIALOG:
       ia_role_ = ROLE_SYSTEM_DIALOG;
       break;
+    case WebAccessibility::ROLE_DISCLOSURE_TRIANGLE:
+      ia_role_ = ROLE_SYSTEM_OUTLINEBUTTON;
+      break;
     case WebAccessibility::ROLE_DOCUMENT:
     case WebAccessibility::ROLE_WEB_AREA:
       ia_role_ = ROLE_SYSTEM_DOCUMENT;
       ia_state_|= STATE_SYSTEM_READONLY;
       ia_state_|= STATE_SYSTEM_FOCUSABLE;
       break;
     case WebAccessibility::ROLE_EDITABLE_TEXT:
       ia_role_ = ROLE_SYSTEM_TEXT;
       ia2_state_ |= IA2_STATE_SINGLE_LINE;
       ia2_state_ |= IA2_STATE_EDITABLE;
       break;
     case WebAccessibility::ROLE_GRID:
       ia_role_ = ROLE_SYSTEM_TABLE;
       break;
     case WebAccessibility::ROLE_GROUP:
       GetAttribute(WebAccessibility::ATTR_HTML_TAG, &role_name_);
       if (role_name_.empty())
         role_name_ = L"div";
       ia2_role_ = IA2_ROLE_SECTION;
       break;
+    case WebAccessibility::ROLE_GROW_AREA:
+      ia_role_ = ROLE_SYSTEM_GRIP;
+      break;
     case WebAccessibility::ROLE_HEADING:
       GetAttribute(WebAccessibility::ATTR_HTML_TAG, &role_name_);
       ia2_role_ = IA2_ROLE_HEADING;
       break;
     case WebAccessibility::ROLE_IMAGE:
       ia_role_ = ROLE_SYSTEM_GRAPHIC;
       break;
     case WebAccessibility::ROLE_IMAGE_MAP:
       GetAttribute(WebAccessibility::ATTR_HTML_TAG, &role_name_);
       ia2_role_ = IA2_ROLE_IMAGE_MAP;
@@ skipping 21 matching lines @@
       ia_role_ = ROLE_SYSTEM_LIST;
       break;
     case WebAccessibility::ROLE_LISTBOX:
       ia_role_ = ROLE_SYSTEM_LIST;
       break;
     case WebAccessibility::ROLE_LISTBOX_OPTION:
     case WebAccessibility::ROLE_LIST_ITEM:
     case WebAccessibility::ROLE_LIST_MARKER:
       ia_role_ = ROLE_SYSTEM_LISTITEM;
       break;
+    case WebAccessibility::ROLE_MATH:
+      ia_role_ = ROLE_SYSTEM_EQUATION;
+      break;
     case WebAccessibility::ROLE_MENU:
     case WebAccessibility::ROLE_MENU_BUTTON:
       ia_role_ = ROLE_SYSTEM_MENUPOPUP;
       break;
     case WebAccessibility::ROLE_MENU_BAR:
       ia_role_ = ROLE_SYSTEM_MENUBAR;
       break;
     case WebAccessibility::ROLE_MENU_ITEM:
     case WebAccessibility::ROLE_MENU_LIST_OPTION:
       ia_role_ = ROLE_SYSTEM_MENUITEM;
@@ skipping 49 matching lines @@
       ia_role_ = ROLE_SYSTEM_CLIENT;
       ia2_role_ = IA2_ROLE_SPLIT_PANE;
       break;
     case WebAccessibility::ROLE_ANNOTATION:
     case WebAccessibility::ROLE_STATIC_TEXT:
       ia_role_ = ROLE_SYSTEM_TEXT;
       break;
     case WebAccessibility::ROLE_STATUS:
       ia_role_ = ROLE_SYSTEM_STATUSBAR;
       break;
+    case WebAccessibility::ROLE_SPLITTER:
+      ia_role_ = ROLE_SYSTEM_SEPARATOR;
+      break;
     case WebAccessibility::ROLE_TAB:
       ia_role_ = ROLE_SYSTEM_PAGETAB;
       break;
     case WebAccessibility::ROLE_TABLE:
       ia_role_ = ROLE_SYSTEM_TABLE;
       break;
     case WebAccessibility::ROLE_TABLE_HEADER_CONTAINER:
       ia_role_ = ROLE_SYSTEM_GROUPING;
       ia2_role_ = IA2_ROLE_SECTION;
       break;
     case WebAccessibility::ROLE_TAB_GROUP:
     case WebAccessibility::ROLE_TAB_LIST:
     case WebAccessibility::ROLE_TAB_PANEL:
       ia_role_ = ROLE_SYSTEM_PAGETABLIST;
       break;
     case WebAccessibility::ROLE_TEXTAREA:
       ia_role_ = ROLE_SYSTEM_TEXT;
       ia2_state_ |= IA2_STATE_MULTI_LINE;
       ia2_state_ |= IA2_STATE_EDITABLE;
       break;
     case WebAccessibility::ROLE_TEXT_FIELD:
       ia_role_ = ROLE_SYSTEM_TEXT;
       ia2_state_ |= IA2_STATE_SINGLE_LINE;
       ia2_state_ |= IA2_STATE_EDITABLE;
       break;
+    case WebAccessibility::ROLE_TIMER:
+      ia_role_ = ROLE_SYSTEM_CLOCK;
+      break;
     case WebAccessibility::ROLE_TOOLBAR:
       ia_role_ = ROLE_SYSTEM_TOOLBAR;
       break;
     case WebAccessibility::ROLE_TOOLTIP:
       ia_role_ = ROLE_SYSTEM_TOOLTIP;
       break;
     case WebAccessibility::ROLE_TREE:
       ia_role_ = ROLE_SYSTEM_OUTLINE;
       break;
     case WebAccessibility::ROLE_TREE_GRID:
       ia_role_ = ROLE_SYSTEM_OUTLINE;
       break;
     case WebAccessibility::ROLE_TREE_ITEM:
       ia_role_ = ROLE_SYSTEM_OUTLINEITEM;
       break;
     case WebAccessibility::ROLE_WINDOW:
       ia_role_ = ROLE_SYSTEM_WINDOW;
       break;
 
     // TODO(dmazzoni): figure out the proper MSAA role for all of these.
     case WebAccessibility::ROLE_BROWSER:
-    case WebAccessibility::ROLE_BUSY_INDICATOR:
     case WebAccessibility::ROLE_DIRECTORY:
-    case WebAccessibility::ROLE_DISCLOSURE_TRIANGLE:
     case WebAccessibility::ROLE_DRAWER:
-    case WebAccessibility::ROLE_GROW_AREA:
     case WebAccessibility::ROLE_HELP_TAG:
     case WebAccessibility::ROLE_IGNORED:
     case WebAccessibility::ROLE_INCREMENTOR:
     case WebAccessibility::ROLE_LOG:
     case WebAccessibility::ROLE_MARQUEE:
-    case WebAccessibility::ROLE_MATH:
     case WebAccessibility::ROLE_MATTE:
     case WebAccessibility::ROLE_RULER_MARKER:
     case WebAccessibility::ROLE_SHEET:
     case WebAccessibility::ROLE_SLIDER_THUMB:
-    case WebAccessibility::ROLE_SPLITTER:
     case WebAccessibility::ROLE_SYSTEM_WIDE:
-    case WebAccessibility::ROLE_TIMER:
     case WebAccessibility::ROLE_VALUE_INDICATOR:
     default:
       ia_role_ = ROLE_SYSTEM_CLIENT;
       break;
   }
 
   // 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_;
 }