Clean up accessibility enums for use in Chromium.

Source/core/accessibility/AccessibilityRenderObject.cpp

 /*
 * Copyright (C) 2008 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 308 matching lines @@
     Node* node = m_renderer->node();
     AccessibilityRole ariaRole = ariaRoleAttribute();
     if (ariaRole != UnknownRole)
         return ariaRole;
 
     RenderBoxModelObject* cssBox = renderBoxModelObject();
 
     if (node && node->isLink()) {
         if (cssBox && cssBox->isImage())
             return ImageMapRole;
-        return WebCoreLinkRole;
+        return LinkRole;
     }
     if (cssBox && cssBox->isListItem())
         return ListItemRole;
     if (m_renderer->isListMarker())
         return ListMarkerRole;
     if (node && node->hasTagName(buttonTag))
         return buttonRoleType();
     if (node && node->hasTagName(legendTag))
         return LegendRole;
     if (m_renderer->isText())
@@ skipping 73 matching lines @@
     if (node && isHTMLLabelElement(node))
         return LabelRole;
 
     if (node && node->hasTagName(divTag))
         return DivRole;
 
     if (node && node->hasTagName(formTag))
         return FormRole;
 
     if (node && node->hasTagName(articleTag))
-        return DocumentArticleRole;
+        return ArticleRole;
 
     if (node && node->hasTagName(mainTag))
-        return LandmarkMainRole;
+        return MainRole;
 
     if (node && node->hasTagName(navTag))
-        return LandmarkNavigationRole;
+        return NavigationRole;
 
     if (node && node->hasTagName(asideTag))
-        return LandmarkComplementaryRole;
+        return ComplementaryRole;
 
     if (node && node->hasTagName(sectionTag))
-        return DocumentRegionRole;
+        return RegionRole;
 
     if (node && node->hasTagName(addressTag))
-        return LandmarkContentInfoRole;
+        return ContentInfoRole;
 
     // The HTML element should not be exposed as an element. That's what the RenderView element does.
     if (node && isHTMLHtmlElement(node))
         return IgnoredRole;
 
     // There should only be one banner/contentInfo per page. If header/footer are being used within an article or section
     // then it should not be exposed as whole page's banner/contentInfo
     if (node && node->hasTagName(headerTag) && !isDescendantOfElementType(articleTag) && !isDescendantOfElementType(sectionTag))
-        return LandmarkBannerRole;
+        return BannerRole;
     if (node && node->hasTagName(footerTag) && !isDescendantOfElementType(articleTag) && !isDescendantOfElementType(sectionTag))
         return FooterRole;
 
     if (node && node->hasTagName(aTag) && isClickable())
-        return WebCoreLinkRole;
+        return LinkRole;
 
     if (m_renderer->isBlockFlow())
         return GroupRole;
 
     // If the element does not have role, but it has ARIA attributes, accessibility should fallback to exposing it as a group.
     if (supportsARIAAttributes())
         return GroupRole;
 
     return UnknownRole;
 }
@@ skipping 502 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();
     default:
         return emptyString();
     }
 }
 
 void AccessibilityRenderObject::selectedChildren(AccessibilityChildrenVector& result)
 {
     ASSERT(result.isEmpty());
 
@@ skipping 197 matching lines @@
 const AtomicString& AccessibilityRenderObject::ariaLiveRegionStatus() const
 {
     DEFINE_STATIC_LOCAL(const AtomicString, liveRegionStatusAssertive, ("assertive", AtomicString::ConstructFromLiteral));
     DEFINE_STATIC_LOCAL(const AtomicString, liveRegionStatusPolite, ("polite", AtomicString::ConstructFromLiteral));
     DEFINE_STATIC_LOCAL(const AtomicString, liveRegionStatusOff, ("off", AtomicString::ConstructFromLiteral));
 
     const AtomicString& liveRegionStatus = getAttribute(aria_liveAttr);
     // These roles have implicit live region status.
     if (liveRegionStatus.isEmpty()) {
         switch (roleValue()) {
-        case ApplicationAlertDialogRole:
-        case ApplicationAlertRole:
+        case AlertDialogRole:
+        case AlertRole:
             return liveRegionStatusAssertive;
-        case ApplicationLogRole:
-        case ApplicationStatusRole:
+        case LogRole:
+        case StatusRole:
             return liveRegionStatusPolite;
-        case ApplicationTimerRole:
-        case ApplicationMarqueeRole:
+        case TimerRole:
+        case MarqueeRole:
             return liveRegionStatusOff;
         default:
             break;
         }
     }
 
     return liveRegionStatus;
 }
 
 const AtomicString& AccessibilityRenderObject::ariaLiveRegionRelevant() const
@@ skipping 1306 matching lines @@
         if (label && label->renderer()) {
             LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementRect();
             result.unite(labelRect);
         }
     }
 
     return result;
 }
 
 } // namespace WebCore