| Index: third_party/WebKit/Source/modules/accessibility/AXObjectImpl.h
|
| diff --git a/third_party/WebKit/Source/modules/accessibility/AXObjectImpl.h b/third_party/WebKit/Source/modules/accessibility/AXObjectImpl.h
|
| index 836f8ad90008241e40dc20835c3da20b4a92a361..ca6848b9af8ce2180598b49170466fb388a7512c 100644
|
| --- a/third_party/WebKit/Source/modules/accessibility/AXObjectImpl.h
|
| +++ b/third_party/WebKit/Source/modules/accessibility/AXObjectImpl.h
|
| @@ -59,135 +59,6 @@ enum class AOMStringProperty;
|
|
|
| typedef unsigned AXID;
|
|
|
| -enum AccessibilityRole {
|
| - kUnknownRole = 0, // Not mapped in platform APIs, generally indicates a bug
|
| - kAbbrRole, // No mapping to ARIA role.
|
| - kAlertDialogRole,
|
| - kAlertRole,
|
| - kAnchorRole, // No mapping to ARIA role.
|
| - kAnnotationRole, // No mapping to ARIA role.
|
| - kApplicationRole,
|
| - kArticleRole,
|
| - kAudioRole, // No mapping to ARIA role.
|
| - kBannerRole,
|
| - kBlockquoteRole, // No mapping to ARIA role.
|
| - kBusyIndicatorRole, // No mapping to ARIA role.
|
| - kButtonRole,
|
| - kCanvasRole, // No mapping to ARIA role.
|
| - kCaptionRole, // No mapping to ARIA role.
|
| - kCellRole,
|
| - kCheckBoxRole,
|
| - kColorWellRole, // No mapping to ARIA role.
|
| - kColumnHeaderRole,
|
| - kColumnRole, // No mapping to ARIA role.
|
| - kComboBoxRole,
|
| - kComplementaryRole,
|
| - kContentInfoRole,
|
| - kDateRole, // No mapping to ARIA role.
|
| - kDateTimeRole, // No mapping to ARIA role.
|
| - kDefinitionRole,
|
| - kDescriptionListDetailRole, // No mapping to ARIA role.
|
| - kDescriptionListRole, // No mapping to ARIA role.
|
| - kDescriptionListTermRole, // No mapping to ARIA role.
|
| - kDetailsRole, // No mapping to ARIA role.
|
| - kDialogRole,
|
| - kDirectoryRole,
|
| - kDisclosureTriangleRole, // No mapping to ARIA role.
|
| - kDocumentRole,
|
| - kEmbeddedObjectRole, // No mapping to ARIA role.
|
| - kFeedRole,
|
| - kFigcaptionRole, // No mapping to ARIA role.
|
| - kFigureRole,
|
| - kFooterRole,
|
| - kFormRole,
|
| - kGenericContainerRole, // No role was defined for this container
|
| - kGridRole,
|
| - kGroupRole,
|
| - kHeadingRole,
|
| - kIframePresentationalRole, // No mapping to ARIA role.
|
| - kIframeRole, // No mapping to ARIA role.
|
| - kIgnoredRole, // No mapping to ARIA role.
|
| - kImageMapLinkRole, // No mapping to ARIA role.
|
| - kImageMapRole, // No mapping to ARIA role.
|
| - kImageRole,
|
| - kInlineTextBoxRole, // No mapping to ARIA role.
|
| - kInputTimeRole, // No mapping to ARIA role.
|
| - kLabelRole,
|
| - kLegendRole, // No mapping to ARIA role.
|
| - kLineBreakRole, // No mapping to ARIA role.
|
| - kLinkRole,
|
| - kListBoxOptionRole,
|
| - kListBoxRole,
|
| - kListItemRole,
|
| - kListMarkerRole, // No mapping to ARIA role.
|
| - kListRole,
|
| - kLogRole,
|
| - kMainRole,
|
| - kMarkRole, // No mapping to ARIA role.
|
| - kMarqueeRole,
|
| - kMathRole,
|
| - kMenuBarRole,
|
| - kMenuButtonRole,
|
| - kMenuItemRole,
|
| - kMenuItemCheckBoxRole,
|
| - kMenuItemRadioRole,
|
| - kMenuListOptionRole,
|
| - kMenuListPopupRole,
|
| - kMenuRole,
|
| - kMeterRole,
|
| - kNavigationRole,
|
| - kNoneRole, // ARIA role of "none"
|
| - kNoteRole,
|
| - kOutlineRole, // No mapping to ARIA role.
|
| - kParagraphRole, // No mapping to ARIA role.
|
| - kPopUpButtonRole,
|
| - kPreRole, // No mapping to ARIA role.
|
| - kPresentationalRole,
|
| - kProgressIndicatorRole,
|
| - kRadioButtonRole,
|
| - kRadioGroupRole,
|
| - kRegionRole,
|
| - kRootWebAreaRole, // No mapping to ARIA role.
|
| - kRowHeaderRole,
|
| - kRowRole,
|
| - kRubyRole, // No mapping to ARIA role.
|
| - kRulerRole, // No mapping to ARIA role.
|
| - kSVGRootRole, // No mapping to ARIA role.
|
| - kScrollAreaRole, // No mapping to ARIA role.
|
| - kScrollBarRole,
|
| - kSeamlessWebAreaRole, // No mapping to ARIA role.
|
| - kSearchRole,
|
| - kSearchBoxRole,
|
| - kSliderRole,
|
| - kSliderThumbRole, // No mapping to ARIA role.
|
| - kSpinButtonPartRole, // No mapping to ARIA role.
|
| - kSpinButtonRole,
|
| - kSplitterRole,
|
| - kStaticTextRole, // No mapping to ARIA role.
|
| - kStatusRole,
|
| - kSwitchRole,
|
| - kTabGroupRole, // No mapping to ARIA role.
|
| - kTabListRole,
|
| - kTabPanelRole,
|
| - kTabRole,
|
| - kTableHeaderContainerRole, // No mapping to ARIA role.
|
| - kTableRole,
|
| - kTermRole,
|
| - kTextFieldRole,
|
| - kTimeRole, // No mapping to ARIA role.
|
| - kTimerRole,
|
| - kToggleButtonRole,
|
| - kToolbarRole,
|
| - kTreeGridRole,
|
| - kTreeItemRole,
|
| - kTreeRole,
|
| - kUserInterfaceTooltipRole,
|
| - kVideoRole, // No mapping to ARIA role.
|
| - kWebAreaRole, // No mapping to ARIA role.
|
| - kWindowRole, // No mapping to ARIA role.
|
| - kNumRoles
|
| -};
|
| -
|
| enum AccessibilityTextSource {
|
| kAlternativeText,
|
| kChildrenText,
|
| @@ -199,30 +70,6 @@ enum AccessibilityTextSource {
|
| kLabelByElementText,
|
| };
|
|
|
| -enum AccessibilityState {
|
| - kAXBusyState,
|
| - kAXCheckedState,
|
| - kAXEnabledState,
|
| - kAXExpandedState,
|
| - kAXFocusableState,
|
| - kAXFocusedState,
|
| - kAXHaspopupState,
|
| - kAXHoveredState,
|
| - kAXInvisibleState,
|
| - kAXLinkedState,
|
| - kAXMultilineState,
|
| - kAXMultiselectableState,
|
| - kAXOffscreenState,
|
| - kAXPressedState,
|
| - kAXProtectedState,
|
| - kAXReadonlyState,
|
| - kAXRequiredState,
|
| - kAXSelectableState,
|
| - kAXSelectedState,
|
| - kAXVerticalState,
|
| - kAXVisitedState
|
| -};
|
| -
|
| class AccessibilityText final
|
| : public GarbageCollectedFinalized<AccessibilityText> {
|
| WTF_MAKE_NONCOPYABLE(AccessibilityText);
|
| @@ -240,91 +87,24 @@ class AccessibilityText final
|
| Member<AXObjectImpl> text_element_;
|
| };
|
|
|
| -enum AccessibilityOrientation {
|
| - kAccessibilityOrientationUndefined = 0,
|
| - kAccessibilityOrientationVertical,
|
| - kAccessibilityOrientationHorizontal,
|
| -};
|
| -
|
| enum AXObjectInclusion {
|
| kIncludeObject,
|
| kIgnoreObject,
|
| kDefaultBehavior,
|
| };
|
|
|
| -enum class AXDefaultActionVerb {
|
| - kNone = 0,
|
| - kActivate,
|
| - kCheck,
|
| - kClick,
|
| - kJump,
|
| - kOpen,
|
| - kPress,
|
| - kSelect,
|
| - kUncheck
|
| -};
|
| -
|
| enum AccessibilityButtonState {
|
| kButtonStateOff = 0,
|
| kButtonStateOn,
|
| kButtonStateMixed,
|
| };
|
|
|
| -enum AccessibilityTextDirection {
|
| - kAccessibilityTextDirectionLTR,
|
| - kAccessibilityTextDirectionRTL,
|
| - kAccessibilityTextDirectionTTB,
|
| - kAccessibilityTextDirectionBTT
|
| -};
|
| -
|
| -enum SortDirection {
|
| - kSortDirectionUndefined = 0,
|
| - kSortDirectionNone,
|
| - kSortDirectionAscending,
|
| - kSortDirectionDescending,
|
| - kSortDirectionOther
|
| -};
|
| -
|
| -enum AccessibilityExpanded {
|
| - kExpandedUndefined = 0,
|
| - kExpandedCollapsed,
|
| - kExpandedExpanded,
|
| -};
|
| -
|
| enum AccessibilityOptionalBool {
|
| kOptionalBoolUndefined = 0,
|
| kOptionalBoolTrue,
|
| kOptionalBoolFalse
|
| };
|
|
|
| -enum AriaCurrentState {
|
| - kAriaCurrentStateUndefined = 0,
|
| - kAriaCurrentStateFalse,
|
| - kAriaCurrentStateTrue,
|
| - kAriaCurrentStatePage,
|
| - kAriaCurrentStateStep,
|
| - kAriaCurrentStateLocation,
|
| - kAriaCurrentStateDate,
|
| - kAriaCurrentStateTime
|
| -};
|
| -
|
| -enum InvalidState {
|
| - kInvalidStateUndefined = 0,
|
| - kInvalidStateFalse,
|
| - kInvalidStateTrue,
|
| - kInvalidStateSpelling,
|
| - kInvalidStateGrammar,
|
| - kInvalidStateOther
|
| -};
|
| -
|
| -enum TextStyle {
|
| - kTextStyleNone = 0,
|
| - kTextStyleBold = 1 << 0,
|
| - kTextStyleItalic = 1 << 1,
|
| - kTextStyleUnderline = 1 << 2,
|
| - kTextStyleLineThrough = 1 << 3
|
| -};
|
| -
|
| enum TextUnderElementMode {
|
| kTextUnderElementAll,
|
| kTextUnderElementAny // If the text is unimportant, just whether or not it's
|
| @@ -333,22 +113,6 @@ enum TextUnderElementMode {
|
|
|
| enum class AXBoolAttribute {};
|
|
|
| -enum class AXStringAttribute {
|
| - kAriaKeyShortcuts,
|
| - kAriaRoleDescription,
|
| -};
|
| -
|
| -enum class AXObjectAttribute {
|
| - kAriaActiveDescendant,
|
| - kAriaErrorMessage,
|
| -};
|
| -
|
| -enum class AXObjectVectorAttribute {
|
| - kAriaControls,
|
| - kAriaDetails,
|
| - kAriaFlowTo,
|
| -};
|
| -
|
| class AXSparseAttributeClient {
|
| public:
|
| virtual void AddBoolAttribute(AXBoolAttribute, bool) = 0;
|
| @@ -358,21 +122,6 @@ class AXSparseAttributeClient {
|
| HeapVector<Member<AXObjectImpl>>&) = 0;
|
| };
|
|
|
| -// The source of the accessible name of an element. This is needed
|
| -// because on some platforms this determines how the accessible name
|
| -// is exposed.
|
| -enum AXNameFrom {
|
| - kAXNameFromUninitialized = -1,
|
| - kAXNameFromAttribute = 0,
|
| - kAXNameFromAttributeExplicitlyEmpty,
|
| - kAXNameFromCaption,
|
| - kAXNameFromContents,
|
| - kAXNameFromPlaceholder,
|
| - kAXNameFromRelatedElement,
|
| - kAXNameFromValue,
|
| - kAXNameFromTitle,
|
| -};
|
| -
|
| // The potential native HTML-based text (name, description or placeholder)
|
| // sources for an element. See
|
| // http://rawgit.com/w3c/aria/master/html-aam/html-aam.html#accessible-name-and-description-calculation
|
| @@ -387,16 +136,6 @@ enum AXTextFromNativeHTML {
|
| kAXTextFromNativeHTMLTitleElement,
|
| };
|
|
|
| -// The source of the accessible description of an element. This is needed
|
| -// because on some platforms this determines how the accessible description
|
| -// is exposed.
|
| -enum AXDescriptionFrom {
|
| - kAXDescriptionFromUninitialized = -1,
|
| - kAXDescriptionFromAttribute = 0,
|
| - kAXDescriptionFromContents,
|
| - kAXDescriptionFromRelatedElement,
|
| -};
|
| -
|
| enum AXIgnoredReason {
|
| kAXActiveModalDialog,
|
| kAXAncestorDisallowsChild,
|
|
|