Fix accessible roles after snapshot update

Change-Id: I017d2cdf1424365c1a76ab2fce507c699a1ca502
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

1 files changed, 100 insertions, 102 deletions

diff --git a/src/core/browser_accessibility_qt.cpp b/src/core/browser_accessibility_qt.cpp
index 3fddbe50e..163ba54de 100644
--- a/src/core/browser_accessibility_qt.cpp
+++ b/src/core/browser_accessibility_qt.cpp
@@ -163,212 +163,210 @@ QRect BrowserAccessibilityQt::rect() const
 QAccessible::Role BrowserAccessibilityQt::role() const
 {
     switch (GetRole()) {
-    case WebAXRoleUnknown:
+    case ui::AX_ROLE_UNKNOWN:
         return QAccessible::NoRole;
 
     // Used by Chromium to distinguish between the root of the tree
     // for this page, and a web area for a frame within this page.
-    case WebAXRoleWebArea:
-    case WebAXRoleRootWebArea: // not sure if we need to make a diff here, but this seems common
+    case ui::AX_ROLE_WEB_AREA:
+    case ui::AX_ROLE_ROOT_WEB_AREA: // not sure if we need to make a diff here, but this seems common
         return QAccessible::WebDocument;
 
     // These roles all directly correspond to blink accessibility roles,
     // keep these alphabetical.
-    case WebAXRoleAlert:
+    case ui::AX_ROLE_ALERT:
         return QAccessible::AlertMessage;
-    case WebAXRoleAnnotation:
+    case ui::AX_ROLE_ANNOTATION:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleApplication:
+    case ui::AX_ROLE_APPLICATION:
         return QAccessible::Document; // returning Application here makes Qt return the top level app object
-    case WebAXRoleArticle:
+    case ui::AX_ROLE_ARTICLE:
         return QAccessible::Document; // FIXME
-    case WebAXRoleBrowser:
+    case ui::AX_ROLE_BROWSER:
         return QAccessible::Document; // FIXME
-    case WebAXRoleBusyIndicator:
+    case ui::AX_ROLE_BUSY_INDICATOR:
         return QAccessible::Animation; // FIXME
-    case WebAXRoleButton:
+    case ui::AX_ROLE_BUTTON:
         return QAccessible::Button;
-    case WebAXRoleCanvas:
+    case ui::AX_ROLE_CANVAS:
         return QAccessible::Canvas;
-    case WebAXRoleCell:
+    case ui::AX_ROLE_CELL:
         return QAccessible::Cell;
-    case WebAXRoleCheckBox:
+    case ui::AX_ROLE_CHECK_BOX:
         return QAccessible::CheckBox;
-    case WebAXRoleColorWell:
+    case ui::AX_ROLE_COLOR_WELL:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleColumn:
+    case ui::AX_ROLE_COLUMN:
         return QAccessible::Column;
-    case WebAXRoleColumnHeader:
+    case ui::AX_ROLE_COLUMN_HEADER:
         return QAccessible::ColumnHeader;
-    case WebAXRoleComboBox:
+    case ui::AX_ROLE_COMBO_BOX:
         return QAccessible::ComboBox;
-    case WebAXRoleDefinition:
+    case ui::AX_ROLE_DEFINITION:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleDescriptionListDetail:
+    case ui::AX_ROLE_DESCRIPTION_LIST_DETAIL:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleDescriptionListTerm:
+    case ui::AX_ROLE_DESCRIPTION_LIST_TERM:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleDialog:
+    case ui::AX_ROLE_DIALOG:
         return QAccessible::Dialog;
-    case WebAXRoleDirectory:
+    case ui::AX_ROLE_DIRECTORY:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleDisclosureTriangle:
+    case ui::AX_ROLE_DISCLOSURE_TRIANGLE:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleDiv:
+    case ui::AX_ROLE_DIV:
         return QAccessible::Section;
-    case WebAXRoleDocument:
+    case ui::AX_ROLE_DOCUMENT:
         return QAccessible::Document;
-    case WebAXRoleDrawer:
+    case ui::AX_ROLE_DRAWER:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleEditableText:
+    case ui::AX_ROLE_EDITABLE_TEXT:
         return QAccessible::EditableText;
-    case WebAXRoleFooter:
+    case ui::AX_ROLE_FOOTER:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleForm:
+    case ui::AX_ROLE_FORM:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleGrid:
+    case ui::AX_ROLE_GRID:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleGroup:
+    case ui::AX_ROLE_GROUP:
         return QAccessible::Grouping;
-    case WebAXRoleGrowArea:
+    case ui::AX_ROLE_GROW_AREA:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleHeading:
+    case ui::AX_ROLE_HEADING:
         return QAccessible::StaticText; // FIXME
-    case WebAXRoleHelpTag:
+    case ui::AX_ROLE_HELP_TAG:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleHorizontalRule:
+    case ui::AX_ROLE_HORIZONTAL_RULE:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleIgnored:
+    case ui::AX_ROLE_IGNORED:
         return QAccessible::NoRole;
-    case WebAXRoleImage:
+    case ui::AX_ROLE_IMAGE:
         return QAccessible::Graphic;
-    case WebAXRoleImageMap:
+    case ui::AX_ROLE_IMAGE_MAP:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleImageMapLink:
+    case ui::AX_ROLE_IMAGE_MAP_LINK:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleIncrementor:
+    case ui::AX_ROLE_INCREMENTOR:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleInlineTextBox:
+    case ui::AX_ROLE_INLINE_TEXT_BOX:
         return QAccessible::EditableText;
-    case WebAXRoleLabel:
+    case ui::AX_ROLE_LABEL_TEXT:
         return QAccessible::StaticText;
-    case WebAXRoleLink:
+    case ui::AX_ROLE_LINK:
         return QAccessible::Link;
-    case WebAXRoleList:
+    case ui::AX_ROLE_LIST:
         return QAccessible::List;
-    case WebAXRoleListBox:
+    case ui::AX_ROLE_LIST_BOX:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleListBoxOption:
+    case ui::AX_ROLE_LIST_BOX_OPTION:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleListItem:
+    case ui::AX_ROLE_LIST_ITEM:
         return QAccessible::ListItem;
-    case WebAXRoleListMarker:
+    case ui::AX_ROLE_LIST_MARKER:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleLog:
+    case ui::AX_ROLE_LOG:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleMarquee:
+    case ui::AX_ROLE_MARQUEE:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleMath:
+    case ui::AX_ROLE_MATH:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleMatte:
+    case ui::AX_ROLE_MATTE:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleMenu:
+    case ui::AX_ROLE_MENU:
         return QAccessible::PopupMenu;
-    case WebAXRoleMenuBar:
+    case ui::AX_ROLE_MENU_BAR:
         return QAccessible::MenuBar;
-    case WebAXRoleMenuItem:
+    case ui::AX_ROLE_MENU_ITEM:
         return QAccessible::MenuItem;
-    case WebAXRoleMenuButton:
+    case ui::AX_ROLE_MENU_BUTTON:
         return QAccessible::MenuItem;
-    case WebAXRoleMenuListOption:
+    case ui::AX_ROLE_MENU_LIST_OPTION:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleMenuListPopup:
+    case ui::AX_ROLE_MENU_LIST_POPUP:
         return QAccessible::PopupMenu;
-    case WebAXRoleNote:
+    case ui::AX_ROLE_NOTE:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleOutline:
+    case ui::AX_ROLE_OUTLINE:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleParagraph:
+    case ui::AX_ROLE_PARAGRAPH:
         return QAccessible::Paragraph;
-    case WebAXRolePopUpButton:
-        return QAccessible::ComboBox;
-    case WebAXRolePresentational:
+    case ui::AX_ROLE_PRESENTATIONAL:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleProgressIndicator:
+    case ui::AX_ROLE_PROGRESS_INDICATOR:
         return QAccessible::ProgressBar;
-    case WebAXRoleRadioButton:
+    case ui::AX_ROLE_RADIO_BUTTON:
         return QAccessible::RadioButton;
-    case WebAXRoleRadioGroup:
+    case ui::AX_ROLE_RADIO_GROUP:
         return QAccessible::RadioButton;
-    case WebAXRoleRegion:
+    case ui::AX_ROLE_REGION:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleRow:
+    case ui::AX_ROLE_ROW:
         return QAccessible::Row;
-    case WebAXRoleRowHeader:
+    case ui::AX_ROLE_ROW_HEADER:
         return QAccessible::RowHeader;
-    case WebAXRoleRuler:
+    case ui::AX_ROLE_RULER:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleRulerMarker:
+    case ui::AX_ROLE_RULER_MARKER:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleScrollArea:
+    case ui::AX_ROLE_SCROLL_AREA:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleScrollBar:
+    case ui::AX_ROLE_SCROLL_BAR:
         return QAccessible::ScrollBar;
-    case WebAXRoleSheet:
+    case ui::AX_ROLE_SHEET:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleSlider:
+    case ui::AX_ROLE_SLIDER:
         return QAccessible::Slider;
-    case WebAXRoleSliderThumb:
+    case ui::AX_ROLE_SLIDER_THUMB:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleSpinButton:
+    case ui::AX_ROLE_SPIN_BUTTON:
         return QAccessible::SpinBox;
-    case WebAXRoleSpinButtonPart:
+    case ui::AX_ROLE_SPIN_BUTTON_PART:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleSplitter:
+    case ui::AX_ROLE_SPLITTER:
         return QAccessible::Splitter;
-    case WebAXRoleSplitGroup:
+    case ui::AX_ROLE_SPLIT_GROUP:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleStaticText:
+    case ui::AX_ROLE_STATIC_TEXT:
         return QAccessible::StaticText;
-    case WebAXRoleStatus:
+    case ui::AX_ROLE_STATUS:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleSVGRoot:
+    case ui::AX_ROLE_SVG_ROOT:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleSystemWide:
+    case ui::AX_ROLE_SYSTEM_WIDE:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleTab:
+    case ui::AX_ROLE_TAB:
         return QAccessible::PageTab;
-    case WebAXRoleTable:
+    case ui::AX_ROLE_TABLE:
         return QAccessible::Table;
-    case WebAXRoleTableHeaderContainer:
+    case ui::AX_ROLE_TABLE_HEADER_CONTAINER:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleTabGroup:  // blink doesn't use (uses ROLE_TAB_LIST)
+    case ui::AX_ROLE_TAB_GROUP:  // blink doesn't use (uses ROLE_TAB_LIST)
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleTabList:
+    case ui::AX_ROLE_TAB_LIST:
         return QAccessible::PageTabList;
-    case WebAXRoleTabPanel:
+    case ui::AX_ROLE_TAB_PANEL:
         return QAccessible::PageTab;
-    case WebAXRoleTextArea:
+    case ui::AX_ROLE_TEXT_AREA:
         return QAccessible::EditableText;
-    case WebAXRoleTextField:
+    case ui::AX_ROLE_TEXT_FIELD:
         return QAccessible::EditableText;
-    case WebAXRoleTimer:
+    case ui::AX_ROLE_TIMER:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleToggleButton:
+    case ui::AX_ROLE_TOGGLE_BUTTON:
         return QAccessible::Button; // FIXME
-    case WebAXRoleToolbar:
+    case ui::AX_ROLE_TOOLBAR:
         return QAccessible::ToolBar;
-    case WebAXRoleUserInterfaceTooltip:
+    case ui::AX_ROLE_TOOLTIP:
         return QAccessible::ToolTip;
-    case WebAXRoleTree:
+    case ui::AX_ROLE_TREE:
         return QAccessible::Tree;
-    case WebAXRoleTreeGrid:
+    case ui::AX_ROLE_TREE_GRID:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleTreeItem:
+    case ui::AX_ROLE_TREE_ITEM:
         return QAccessible::TreeItem;
-    case WebAXRoleValueIndicator:
+    case ui::AX_ROLE_VALUE_INDICATOR:
         return QAccessible::NoRole; // FIXME
-    case WebAXRoleWindow:
+    case ui::AX_ROLE_WINDOW:
         return QAccessible::Window;
     }
     return QAccessible::NoRole;