Clean up accessibility enums for use in Chromium.

Source/core/accessibility/AccessibilityObject.h

 /*
  * Copyright (C) 2008, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nuanti Ltd.
  *
  * 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.
@@ skipping 42 matching lines @@
 class Page;
 class RenderObject;
 class RenderListItem;
 class ScrollableArea;
 class VisibleSelection;
 class Widget;
 
 typedef unsigned AXID;
 
 enum AccessibilityRole {
-    AnnotationRole = 1,
+    AlertDialogRole = 1,
+    AlertRole,
+    AnnotationRole,
     ApplicationRole,
-    ApplicationAlertRole,
-    ApplicationAlertDialogRole,
-    ApplicationDialogRole,
-    ApplicationLogRole,
-    ApplicationMarqueeRole,
-    ApplicationStatusRole,
-    ApplicationTimerRole,
+    ArticleRole,
+    BannerRole,
     BrowserRole,
     BusyIndicatorRole,
     ButtonRole,
     CanvasRole,
     CellRole,
     CheckBoxRole,
     ColorWellRole,
+    ColumnHeaderRole,
     ColumnRole,
-    ColumnHeaderRole,
     ComboBoxRole,
+    ComplementaryRole,
+    ContentInfoRole,
     DefinitionRole,
+    DescriptionListDetailRole,
     DescriptionListTermRole,
-    DescriptionListDetailRole,
+    DialogRole,
     DirectoryRole,
     DisclosureTriangleRole,
     DivRole,
     DocumentRole,
-    DocumentArticleRole,
-    DocumentMathRole,
-    DocumentNoteRole,
-    DocumentRegionRole,
     DrawerRole,
     EditableTextRole,
     FooterRole,
     FormRole,
     GridRole,
     GroupRole,
     GrowAreaRole,
     HeadingRole,
     HelpTagRole,
     HorizontalRuleRole,
     IgnoredRole,
+    ImageMapLinkRole,
+    ImageMapRole,
     ImageRole,
-    ImageMapRole,
-    ImageMapLinkRole,
     IncrementorRole,
     LabelRole,
-    LandmarkApplicationRole,
-    LandmarkBannerRole,
-    LandmarkComplementaryRole,
-    LandmarkContentInfoRole,
-    LandmarkMainRole,
-    LandmarkNavigationRole,
-    LandmarkSearchRole,
     LegendRole,
     LinkRole,
-    ListRole,
+    ListBoxOptionRole,
     ListBoxRole,
-    ListBoxOptionRole,
     ListItemRole,
     ListMarkerRole,
+    ListRole,
+    LogRole,
+    MainRole,
+    MarqueeRole,
     MathElementRole,
+    MathRole,
     MatteRole,
-    MenuRole,
     MenuBarRole,
     MenuButtonRole,
     MenuItemRole,
+    MenuListOptionRole,
     MenuListPopupRole,
-    MenuListOptionRole,
+    MenuRole,
+    NavigationRole,
+    NoteRole,
     OutlineRole,
     ParagraphRole,
     PopUpButtonRole,
     PresentationalRole,
     ProgressIndicatorRole,
     RadioButtonRole,
     RadioGroupRole,
+    RegionRole,
     RowHeaderRole,
     RowRole,
+    RulerMarkerRole,
     RulerRole,
-    RulerMarkerRole,
+    SVGRootRole,
     ScrollAreaRole,
     ScrollBarRole,
     SeamlessWebAreaRole,
+    SearchRole,
     SheetRole,
     SliderRole,
     SliderThumbRole,
+    SpinButtonPartRole,
     SpinButtonRole,
-    SpinButtonPartRole,
     SplitGroupRole,
     SplitterRole,
     StaticTextRole,
+    StatusRole,
     SystemWideRole,
-    SVGRootRole,
     TabGroupRole,
     TabListRole,
     TabPanelRole,
     TabRole,
+    TableHeaderContainerRole,
     TableRole,
-    TableHeaderContainerRole,
     TextAreaRole,
-    TreeRole,
+    TextFieldRole,
+    TimerRole,
+    ToggleButtonRole,
+    ToolbarRole,
     TreeGridRole,
     TreeItemRole,
-    TextFieldRole,
-    ToggleButtonRole,
-    ToolbarRole,
+    TreeRole,
     UnknownRole,
     UserInterfaceTooltipRole,
     ValueIndicatorRole,
     WebAreaRole,
-    WebCoreLinkRole,

[aboxhall, 2013/08/07 15:58:10]

What was this role doing previously? I see there was already a LinkRole.

[dmazzoni, 2013/08/07 16:23:53]

No idea why WebKit had both. LinkRole was never used as far as I can tell, so
I'm just mapping WebCoreLinkRole to LinkRole everywhere.

     WindowRole,
 };
 
 enum AccessibilityTextSource {
     AlternativeText,
     ChildrenText,
     SummaryText,
     HelpText,
     VisibleText,
     TitleTagText,
     PlaceholderText,
     LabelByElementText,
 };
 
+enum AccessibilityState {
+    AXBusyState,
+    AXCheckedState,
+    AXCollapsedState,
+    AXEnabledState,
+    AXExpandedState,
+    AXFocusableState,
+    AXFocusedState,
+    AXHaspopupState,
+    AXHoveredState,
+    AXIndeterminateState,
+    AXInvisibleState,
+    AXLinkedState,
+    AXMultiselectableState,
+    AXOffscreenState,
+    AXPressedState,
+    AXProtectedState,
+    AXReadonlyState,
+    AXRequiredState,
+    AXSelectableState,
+    AXSelectedState,
+    AXVerticalState,
+    AXVisitedState
+};
+
 struct AccessibilityText {
     String text;
     AccessibilityTextSource textSource;
     RefPtr<AccessibilityObject> textElement;
 
     AccessibilityText(const String& t, const AccessibilityTextSource& s)
     : text(t)
     , textSource(s)
     { }
 
@@ skipping 363 matching lines @@
 #if !HAVE(ACCESSIBILITY)
 inline const AccessibilityObject::AccessibilityChildrenVector& AccessibilityObject::children() { return m_children; }
 inline String AccessibilityObject::actionVerb() const { return emptyString(); }
 inline int AccessibilityObject::lineForPosition(const VisiblePosition&) const { return -1; }
 inline void AccessibilityObject::updateBackingStore() { }
 #endif
 
 } // namespace WebCore
 
 #endif // AccessibilityObject_h