Commit a3aa03fc authored by dmazzoni@chromium.org's avatar dmazzoni@chromium.org

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

Pritchard for suggesting these mappings.

Review URL: http://codereview.chromium.org/6372012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72440 0039d316-1c4b-4281-b951-d872f2087c98
parent a0982ec4
...@@ -1324,6 +1324,9 @@ void BrowserAccessibilityWin::InitRoleAndState() { ...@@ -1324,6 +1324,9 @@ void BrowserAccessibilityWin::InitRoleAndState() {
ia_role_ = ROLE_SYSTEM_GROUPING; ia_role_ = ROLE_SYSTEM_GROUPING;
ia2_role_ = IA2_ROLE_SECTION; ia2_role_ = IA2_ROLE_SECTION;
break; break;
case WebAccessibility::ROLE_BUSY_INDICATOR:
ia_role_ = ROLE_SYSTEM_ANIMATION;
break;
case WebAccessibility::ROLE_BUTTON: case WebAccessibility::ROLE_BUTTON:
ia_role_ = ROLE_SYSTEM_PUSHBUTTON; ia_role_ = ROLE_SYSTEM_PUSHBUTTON;
break; break;
...@@ -1356,6 +1359,9 @@ void BrowserAccessibilityWin::InitRoleAndState() { ...@@ -1356,6 +1359,9 @@ void BrowserAccessibilityWin::InitRoleAndState() {
case WebAccessibility::ROLE_DIALOG: case WebAccessibility::ROLE_DIALOG:
ia_role_ = ROLE_SYSTEM_DIALOG; ia_role_ = ROLE_SYSTEM_DIALOG;
break; break;
case WebAccessibility::ROLE_DISCLOSURE_TRIANGLE:
ia_role_ = ROLE_SYSTEM_OUTLINEBUTTON;
break;
case WebAccessibility::ROLE_DOCUMENT: case WebAccessibility::ROLE_DOCUMENT:
case WebAccessibility::ROLE_WEB_AREA: case WebAccessibility::ROLE_WEB_AREA:
ia_role_ = ROLE_SYSTEM_DOCUMENT; ia_role_ = ROLE_SYSTEM_DOCUMENT;
...@@ -1376,6 +1382,9 @@ void BrowserAccessibilityWin::InitRoleAndState() { ...@@ -1376,6 +1382,9 @@ void BrowserAccessibilityWin::InitRoleAndState() {
role_name_ = L"div"; role_name_ = L"div";
ia2_role_ = IA2_ROLE_SECTION; ia2_role_ = IA2_ROLE_SECTION;
break; break;
case WebAccessibility::ROLE_GROW_AREA:
ia_role_ = ROLE_SYSTEM_GRIP;
break;
case WebAccessibility::ROLE_HEADING: case WebAccessibility::ROLE_HEADING:
GetAttribute(WebAccessibility::ATTR_HTML_TAG, &role_name_); GetAttribute(WebAccessibility::ATTR_HTML_TAG, &role_name_);
ia2_role_ = IA2_ROLE_HEADING; ia2_role_ = IA2_ROLE_HEADING;
...@@ -1417,6 +1426,9 @@ void BrowserAccessibilityWin::InitRoleAndState() { ...@@ -1417,6 +1426,9 @@ void BrowserAccessibilityWin::InitRoleAndState() {
case WebAccessibility::ROLE_LIST_MARKER: case WebAccessibility::ROLE_LIST_MARKER:
ia_role_ = ROLE_SYSTEM_LISTITEM; ia_role_ = ROLE_SYSTEM_LISTITEM;
break; break;
case WebAccessibility::ROLE_MATH:
ia_role_ = ROLE_SYSTEM_EQUATION;
break;
case WebAccessibility::ROLE_MENU: case WebAccessibility::ROLE_MENU:
case WebAccessibility::ROLE_MENU_BUTTON: case WebAccessibility::ROLE_MENU_BUTTON:
ia_role_ = ROLE_SYSTEM_MENUPOPUP; ia_role_ = ROLE_SYSTEM_MENUPOPUP;
...@@ -1486,6 +1498,9 @@ void BrowserAccessibilityWin::InitRoleAndState() { ...@@ -1486,6 +1498,9 @@ void BrowserAccessibilityWin::InitRoleAndState() {
case WebAccessibility::ROLE_STATUS: case WebAccessibility::ROLE_STATUS:
ia_role_ = ROLE_SYSTEM_STATUSBAR; ia_role_ = ROLE_SYSTEM_STATUSBAR;
break; break;
case WebAccessibility::ROLE_SPLITTER:
ia_role_ = ROLE_SYSTEM_SEPARATOR;
break;
case WebAccessibility::ROLE_TAB: case WebAccessibility::ROLE_TAB:
ia_role_ = ROLE_SYSTEM_PAGETAB; ia_role_ = ROLE_SYSTEM_PAGETAB;
break; break;
...@@ -1511,6 +1526,9 @@ void BrowserAccessibilityWin::InitRoleAndState() { ...@@ -1511,6 +1526,9 @@ void BrowserAccessibilityWin::InitRoleAndState() {
ia2_state_ |= IA2_STATE_SINGLE_LINE; ia2_state_ |= IA2_STATE_SINGLE_LINE;
ia2_state_ |= IA2_STATE_EDITABLE; ia2_state_ |= IA2_STATE_EDITABLE;
break; break;
case WebAccessibility::ROLE_TIMER:
ia_role_ = ROLE_SYSTEM_CLOCK;
break;
case WebAccessibility::ROLE_TOOLBAR: case WebAccessibility::ROLE_TOOLBAR:
ia_role_ = ROLE_SYSTEM_TOOLBAR; ia_role_ = ROLE_SYSTEM_TOOLBAR;
break; break;
...@@ -1532,24 +1550,18 @@ void BrowserAccessibilityWin::InitRoleAndState() { ...@@ -1532,24 +1550,18 @@ void BrowserAccessibilityWin::InitRoleAndState() {
// TODO(dmazzoni): figure out the proper MSAA role for all of these. // TODO(dmazzoni): figure out the proper MSAA role for all of these.
case WebAccessibility::ROLE_BROWSER: case WebAccessibility::ROLE_BROWSER:
case WebAccessibility::ROLE_BUSY_INDICATOR:
case WebAccessibility::ROLE_DIRECTORY: case WebAccessibility::ROLE_DIRECTORY:
case WebAccessibility::ROLE_DISCLOSURE_TRIANGLE:
case WebAccessibility::ROLE_DRAWER: case WebAccessibility::ROLE_DRAWER:
case WebAccessibility::ROLE_GROW_AREA:
case WebAccessibility::ROLE_HELP_TAG: case WebAccessibility::ROLE_HELP_TAG:
case WebAccessibility::ROLE_IGNORED: case WebAccessibility::ROLE_IGNORED:
case WebAccessibility::ROLE_INCREMENTOR: case WebAccessibility::ROLE_INCREMENTOR:
case WebAccessibility::ROLE_LOG: case WebAccessibility::ROLE_LOG:
case WebAccessibility::ROLE_MARQUEE: case WebAccessibility::ROLE_MARQUEE:
case WebAccessibility::ROLE_MATH:
case WebAccessibility::ROLE_MATTE: case WebAccessibility::ROLE_MATTE:
case WebAccessibility::ROLE_RULER_MARKER: case WebAccessibility::ROLE_RULER_MARKER:
case WebAccessibility::ROLE_SHEET: case WebAccessibility::ROLE_SHEET:
case WebAccessibility::ROLE_SLIDER_THUMB: case WebAccessibility::ROLE_SLIDER_THUMB:
case WebAccessibility::ROLE_SPLITTER:
case WebAccessibility::ROLE_SYSTEM_WIDE: case WebAccessibility::ROLE_SYSTEM_WIDE:
case WebAccessibility::ROLE_TIMER:
case WebAccessibility::ROLE_VALUE_INDICATOR: case WebAccessibility::ROLE_VALUE_INDICATOR:
default: default:
ia_role_ = ROLE_SYSTEM_CLIENT; ia_role_ = ROLE_SYSTEM_CLIENT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment