diff options
| -rw-r--r-- | chrome/browser/browser_accessibility.cc | 8 | ||||
| -rw-r--r-- | webkit/glue/glue_accessibility_object.cc | 11 | ||||
| -rw-r--r-- | webkit/glue/webaccessibility.h | 6 |
3 files changed, 24 insertions, 1 deletions
diff --git a/chrome/browser/browser_accessibility.cc b/chrome/browser/browser_accessibility.cc index 83534bf..187e456 100644 --- a/chrome/browser/browser_accessibility.cc +++ b/chrome/browser/browser_accessibility.cc @@ -559,6 +559,8 @@ const WebAccessibility::OutParams& BrowserAccessibility::response() { long BrowserAccessibility::MSAARole(long browser_accessibility_role) { switch (browser_accessibility_role) { + case WebAccessibility::ROLE_APPLICATION: + return ROLE_SYSTEM_APPLICATION; case WebAccessibility::ROLE_CELL: return ROLE_SYSTEM_CELL; case WebAccessibility::ROLE_CHECKBUTTON: @@ -598,16 +600,22 @@ long BrowserAccessibility::MSAARole(long browser_accessibility_role) { return ROLE_SYSTEM_ROW; case WebAccessibility::ROLE_ROWHEADER: return ROLE_SYSTEM_ROWHEADER; + case WebAccessibility::ROLE_SEPARATOR: + return ROLE_SYSTEM_SEPARATOR; case WebAccessibility::ROLE_SLIDER: return ROLE_SYSTEM_SLIDER; case WebAccessibility::ROLE_STATICTEXT: return ROLE_SYSTEM_STATICTEXT; + case WebAccessibility::ROLE_STATUSBAR: + return ROLE_SYSTEM_STATUSBAR; case WebAccessibility::ROLE_TABLE: return ROLE_SYSTEM_TABLE; case WebAccessibility::ROLE_TEXT: return ROLE_SYSTEM_TEXT; case WebAccessibility::ROLE_TOOLBAR: return ROLE_SYSTEM_TOOLBAR; + case WebAccessibility::ROLE_TOOLTIP: + return ROLE_SYSTEM_TOOLTIP; case WebAccessibility::ROLE_CLIENT: default: // This is the default role for MSAA. diff --git a/webkit/glue/glue_accessibility_object.cc b/webkit/glue/glue_accessibility_object.cc index d79bdea..0d82bd8 100644 --- a/webkit/glue/glue_accessibility_object.cc +++ b/webkit/glue/glue_accessibility_object.cc @@ -365,6 +365,8 @@ String GlueAccessibilityObject::description() const { // WebAccessibility role (except for default role). Static function. static WebAccessibility::Role SupportedRole(WebCore::AccessibilityRole role) { switch (role) { + case WebCore::LandmarkApplicationRole: + return WebAccessibility::ROLE_APPLICATION; case WebCore::CellRole: return WebAccessibility::ROLE_CELL; case WebCore::CheckBoxRole: @@ -378,6 +380,8 @@ static WebAccessibility::Role SupportedRole(WebCore::AccessibilityRole role) { case WebCore::ImageMapRole: case WebCore::ImageRole: return WebAccessibility::ROLE_GRAPHIC; + case WebCore::DocumentRegionRole: + case WebCore::RadioGroupRole: case WebCore::GroupRole: return WebAccessibility::ROLE_GROUPING; case WebCore::LinkRole: @@ -408,10 +412,14 @@ static WebAccessibility::Role SupportedRole(WebCore::AccessibilityRole role) { return WebAccessibility::ROLE_ROW; case WebCore::RowHeaderRole: return WebAccessibility::ROLE_ROWHEADER; + case WebCore::SplitterRole: + return WebAccessibility::ROLE_SEPARATOR; case WebCore::SliderRole: return WebAccessibility::ROLE_SLIDER; case WebCore::StaticTextRole: return WebAccessibility::ROLE_STATICTEXT; + case WebCore::ApplicationStatusRole: + return WebAccessibility::ROLE_STATUSBAR; case WebCore::TableRole: return WebAccessibility::ROLE_TABLE; case WebCore::ListMarkerRole: @@ -420,6 +428,9 @@ static WebAccessibility::Role SupportedRole(WebCore::AccessibilityRole role) { return WebAccessibility::ROLE_TEXT; case WebCore::ToolbarRole: return WebAccessibility::ROLE_TOOLBAR; + case WebCore::UserInterfaceTooltipRole: + return WebAccessibility::ROLE_TOOLTIP; + case WebCore::DocumentRole: case WebCore::UnknownRole: default: // This is the default role. diff --git a/webkit/glue/webaccessibility.h b/webkit/glue/webaccessibility.h index e13c7b3..5fa23ae 100644 --- a/webkit/glue/webaccessibility.h +++ b/webkit/glue/webaccessibility.h @@ -65,6 +65,7 @@ class WebAccessibility { // conversion to its own roles (see e.g. BrowserAccessibility::get_accRole and // BrowserAccessibility::MSAARole). enum Role { + ROLE_APPLICATION, ROLE_CELL, ROLE_CHECKBUTTON, ROLE_CLIENT, @@ -86,11 +87,14 @@ class WebAccessibility { ROLE_RADIOBUTTON, ROLE_ROW, ROLE_ROWHEADER, + ROLE_SEPARATOR, ROLE_SLIDER, ROLE_STATICTEXT, + ROLE_STATUSBAR, ROLE_TABLE, ROLE_TEXT, - ROLE_TOOLBAR + ROLE_TOOLBAR, + ROLE_TOOLTIP }; // This defines an enumeration (in alphabetical order) of the supported |