Clean up accessibility enums for use in Chromium.

Source/core/accessibility/AccessibilityObject.cpp

 /*
  * Copyright (C) 2008, 2009, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 39 matching lines @@
 typedef HashMap<String, AccessibilityRole, CaseFoldingHash> ARIARoleMap;
 
 struct RoleEntry {
     String ariaRole;
     AccessibilityRole webcoreRole;
 };
 
 static ARIARoleMap* createARIARoleMap()
 {
     const RoleEntry roles[] = {
-        { "alert", ApplicationAlertRole },
-        { "alertdialog", ApplicationAlertDialogRole },
-        { "application", LandmarkApplicationRole },
-        { "article", DocumentArticleRole },
-        { "banner", LandmarkBannerRole },
+        { "alert", AlertRole },
+        { "alertdialog", AlertDialogRole },
+        { "application", ApplicationRole },
+        { "article", ArticleRole },
+        { "banner", BannerRole },
         { "button", ButtonRole },
         { "checkbox", CheckBoxRole },
-        { "complementary", LandmarkComplementaryRole },
-        { "contentinfo", LandmarkContentInfoRole },
-        { "dialog", ApplicationDialogRole },
+        { "complementary", ComplementaryRole },
+        { "contentinfo", ContentInfoRole },
+        { "dialog", DialogRole },
         { "directory", DirectoryRole },
         { "grid", TableRole },
         { "gridcell", CellRole },
         { "columnheader", ColumnHeaderRole },
         { "combobox", ComboBoxRole },
         { "definition", DefinitionRole },
         { "document", DocumentRole },
         { "rowheader", RowHeaderRole },
         { "group", GroupRole },
         { "heading", HeadingRole },
         { "img", ImageRole },
-        { "link", WebCoreLinkRole },
+        { "link", LinkRole },
         { "list", ListRole },
         { "listitem", ListItemRole },
         { "listbox", ListBoxRole },
-        { "log", ApplicationLogRole },
+        { "log", LogRole },
         // "option" isn't here because it may map to different roles depending on the parent element's role
-        { "main", LandmarkMainRole },
-        { "marquee", ApplicationMarqueeRole },
-        { "math", DocumentMathRole },
+        { "main", MainRole },
+        { "marquee", MarqueeRole },
+        { "math", MathRole },
         { "menu", MenuRole },
         { "menubar", MenuBarRole },
         { "menuitem", MenuItemRole },
         { "menuitemcheckbox", MenuItemRole },
         { "menuitemradio", MenuItemRole },
-        { "note", DocumentNoteRole },
-        { "navigation", LandmarkNavigationRole },
+        { "note", NoteRole },
+        { "navigation", NavigationRole },
         { "option", ListBoxOptionRole },
         { "presentation", PresentationalRole },
         { "progressbar", ProgressIndicatorRole },
         { "radio", RadioButtonRole },
         { "radiogroup", RadioGroupRole },
-        { "region", DocumentRegionRole },
+        { "region", RegionRole },
         { "row", RowRole },
         { "scrollbar", ScrollBarRole },
-        { "search", LandmarkSearchRole },
+        { "search", SearchRole },
         { "separator", SplitterRole },
         { "slider", SliderRole },
         { "spinbutton", SpinButtonRole },
-        { "status", ApplicationStatusRole },
+        { "status", StatusRole },
         { "tab", TabRole },
         { "tablist", TabListRole },
         { "tabpanel", TabPanelRole },
         { "text", StaticTextRole },
         { "textbox", TextAreaRole },
-        { "timer", ApplicationTimerRole },
+        { "timer", TimerRole },
         { "toolbar", ToolbarRole },
         { "tooltip", UserInterfaceTooltipRole },
         { "tree", TreeRole },
         { "treegrid", TreeGridRole },
         { "treeitem", TreeItemRole }
     };
     ARIARoleMap* roleMap = new ARIARoleMap;
 
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(roles); ++i)
         roleMap->set(roles[i].ariaRole, roles[i].webcoreRole);
@@ skipping 93 matching lines @@
     case ImageMapLinkRole:
     case LinkRole:
     case ListBoxOptionRole:
     case MenuButtonRole:
     case PopUpButtonRole:
     case RadioButtonRole:
     case TabRole:
     case TextAreaRole:
     case TextFieldRole:
     case ToggleButtonRole:
-    case WebCoreLinkRole:
         return true;
     default:
         return false;
     }
 }
 
 bool AccessibilityObject::isExpanded() const
 {
     if (equalIgnoringCase(getAttribute(aria_expandedAttr), "true"))
         return true;
@@ skipping 84 matching lines @@
     case ToggleButtonRole:
         return AXButtonActionVerb();
     case TextFieldRole:
     case TextAreaRole:
         return AXTextFieldActionVerb();
     case RadioButtonRole:
         return AXRadioButtonActionVerb();
     case CheckBoxRole:
         return isChecked() ? AXCheckedCheckBoxActionVerb() : AXUncheckedCheckBoxActionVerb();
     case LinkRole:
-    case WebCoreLinkRole:
         return AXLinkActionVerb();
     case PopUpButtonRole:
         return AXMenuListActionVerb();
     case MenuListPopupRole:
         return AXMenuListPopupActionVerb();
     default:
         return emptyString();
     }
 }
 #endif
@@ skipping 647 matching lines @@
 
     for (AccessibilityObject* object = parentObject(); object; object = object->parentObject()) {
         if (equalIgnoringCase(object->getAttribute(aria_hiddenAttr), "true"))
             return true;
     }
 
     return false;
 }
 
 } // namespace WebCore