| Index: Source/core/accessibility/AccessibilityObject.h
|
| diff --git a/Source/core/accessibility/AccessibilityObject.h b/Source/core/accessibility/AccessibilityObject.h
|
| index 2f74dd6fadb6f13c369a41b8e45522e644524b2c..081cde3aa1b77d0f0721007096e701cfe12dd8cc 100644
|
| --- a/Source/core/accessibility/AccessibilityObject.h
|
| +++ b/Source/core/accessibility/AccessibilityObject.h
|
| @@ -60,15 +60,12 @@ 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,
|
| @@ -76,20 +73,19 @@ enum AccessibilityRole {
|
| CellRole,
|
| CheckBoxRole,
|
| ColorWellRole,
|
| - ColumnRole,
|
| ColumnHeaderRole,
|
| + ColumnRole,
|
| ComboBoxRole,
|
| + ComplementaryRole,
|
| + ContentInfoRole,
|
| DefinitionRole,
|
| - DescriptionListTermRole,
|
| DescriptionListDetailRole,
|
| + DescriptionListTermRole,
|
| + DialogRole,
|
| DirectoryRole,
|
| DisclosureTriangleRole,
|
| DivRole,
|
| DocumentRole,
|
| - DocumentArticleRole,
|
| - DocumentMathRole,
|
| - DocumentNoteRole,
|
| - DocumentRegionRole,
|
| DrawerRole,
|
| EditableTextRole,
|
| FooterRole,
|
| @@ -101,33 +97,32 @@ enum AccessibilityRole {
|
| HelpTagRole,
|
| HorizontalRuleRole,
|
| IgnoredRole,
|
| - ImageRole,
|
| - ImageMapRole,
|
| ImageMapLinkRole,
|
| + ImageMapRole,
|
| + ImageRole,
|
| IncrementorRole,
|
| LabelRole,
|
| - LandmarkApplicationRole,
|
| - LandmarkBannerRole,
|
| - LandmarkComplementaryRole,
|
| - LandmarkContentInfoRole,
|
| - LandmarkMainRole,
|
| - LandmarkNavigationRole,
|
| - LandmarkSearchRole,
|
| LegendRole,
|
| LinkRole,
|
| - ListRole,
|
| - ListBoxRole,
|
| ListBoxOptionRole,
|
| + ListBoxRole,
|
| ListItemRole,
|
| ListMarkerRole,
|
| + ListRole,
|
| + LogRole,
|
| + MainRole,
|
| + MarqueeRole,
|
| MathElementRole,
|
| + MathRole,
|
| MatteRole,
|
| - MenuRole,
|
| MenuBarRole,
|
| MenuButtonRole,
|
| MenuItemRole,
|
| - MenuListPopupRole,
|
| MenuListOptionRole,
|
| + MenuListPopupRole,
|
| + MenuRole,
|
| + NavigationRole,
|
| + NoteRole,
|
| OutlineRole,
|
| ParagraphRole,
|
| PopUpButtonRole,
|
| @@ -135,41 +130,45 @@ enum AccessibilityRole {
|
| ProgressIndicatorRole,
|
| RadioButtonRole,
|
| RadioGroupRole,
|
| + RegionRole,
|
| + RootWebAreaRole,
|
| RowHeaderRole,
|
| RowRole,
|
| - RulerRole,
|
| RulerMarkerRole,
|
| + RulerRole,
|
| + SVGRootRole,
|
| ScrollAreaRole,
|
| ScrollBarRole,
|
| SeamlessWebAreaRole,
|
| + SearchRole,
|
| SheetRole,
|
| SliderRole,
|
| SliderThumbRole,
|
| - SpinButtonRole,
|
| SpinButtonPartRole,
|
| + SpinButtonRole,
|
| SplitGroupRole,
|
| SplitterRole,
|
| StaticTextRole,
|
| + StatusRole,
|
| SystemWideRole,
|
| - SVGRootRole,
|
| TabGroupRole,
|
| TabListRole,
|
| TabPanelRole,
|
| TabRole,
|
| - TableRole,
|
| TableHeaderContainerRole,
|
| + TableRole,
|
| TextAreaRole,
|
| - TreeRole,
|
| - TreeGridRole,
|
| - TreeItemRole,
|
| TextFieldRole,
|
| + TimerRole,
|
| ToggleButtonRole,
|
| ToolbarRole,
|
| + TreeGridRole,
|
| + TreeItemRole,
|
| + TreeRole,
|
| UnknownRole,
|
| UserInterfaceTooltipRole,
|
| ValueIndicatorRole,
|
| WebAreaRole,
|
| - WebCoreLinkRole,
|
| WindowRole,
|
| };
|
|
|
| @@ -184,6 +183,31 @@ enum AccessibilityTextSource {
|
| 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;
|
|
|