diff options
Diffstat (limited to 'src/core/browser_accessibility_qt.cpp')
-rw-r--r-- | src/core/browser_accessibility_qt.cpp | 56 |
1 files changed, 39 insertions, 17 deletions
diff --git a/src/core/browser_accessibility_qt.cpp b/src/core/browser_accessibility_qt.cpp index 816a46041..6104fb1f8 100644 --- a/src/core/browser_accessibility_qt.cpp +++ b/src/core/browser_accessibility_qt.cpp @@ -225,8 +225,6 @@ QAccessible::Role BrowserAccessibilityQt::role() const return QAccessible::AlertMessage; case ax::mojom::Role::kAnchor: return QAccessible::Link; - case ax::mojom::Role::kAnnotation: - return QAccessible::StaticText; case ax::mojom::Role::kApplication: return QAccessible::Document; // returning Application here makes Qt return the top level app object case ax::mojom::Role::kArticle: @@ -251,6 +249,8 @@ QAccessible::Role BrowserAccessibilityQt::role() const return QAccessible::CheckBox; case ax::mojom::Role::kClient: return QAccessible::Client; + case ax::mojom::Role::kCode: + return QAccessible::StaticText; case ax::mojom::Role::kColorWell: return QAccessible::ColorChooser; case ax::mojom::Role::kColumn: @@ -263,6 +263,9 @@ QAccessible::Role BrowserAccessibilityQt::role() const return QAccessible::ComboBox; case ax::mojom::Role::kComplementary: return QAccessible::ComplementaryContent; + case ax::mojom::Role::kComment: + case ax::mojom::Role::kCommentSection: + return QAccessible::Section; case ax::mojom::Role::kContentDeletion: case ax::mojom::Role::kContentInsertion: return QAccessible::Grouping; @@ -282,17 +285,17 @@ QAccessible::Role BrowserAccessibilityQt::role() const case ax::mojom::Role::kDetails: return QAccessible::Grouping; case ax::mojom::Role::kDesktop: - return QAccessible::NoRole; // FIXME + return QAccessible::Pane; case ax::mojom::Role::kDialog: return QAccessible::Dialog; case ax::mojom::Role::kDirectory: - return QAccessible::NoRole; // FIXME + return QAccessible::List; case ax::mojom::Role::kDisclosureTriangle: - return QAccessible::NoRole; // FIXME + return QAccessible::Button; case ax::mojom::Role::kGenericContainer: return QAccessible::Section; case ax::mojom::Role::kDocCover: - return QAccessible::Graphic; + return QAccessible::Graphic; case ax::mojom::Role::kDocBackLink: case ax::mojom::Role::kDocBiblioRef: case ax::mojom::Role::kDocGlossRef: @@ -331,14 +334,18 @@ QAccessible::Role BrowserAccessibilityQt::role() const case ax::mojom::Role::kDocPrologue: case ax::mojom::Role::kDocPullquote: case ax::mojom::Role::kDocQna: + return QAccessible::Section; case ax::mojom::Role::kDocSubtitle: + return QAccessible::Heading; case ax::mojom::Role::kDocTip: case ax::mojom::Role::kDocToc: return QAccessible::Section; case ax::mojom::Role::kDocument: return QAccessible::Document; case ax::mojom::Role::kEmbeddedObject: - return QAccessible::Grouping; // FIXME + return QAccessible::Grouping; + case ax::mojom::Role::kEmphasis: + return QAccessible::StaticText; case ax::mojom::Role::kFeed: return QAccessible::Section; case ax::mojom::Role::kFigcaption: @@ -347,6 +354,8 @@ QAccessible::Role BrowserAccessibilityQt::role() const return QAccessible::Section; case ax::mojom::Role::kFooter: return QAccessible::Footer; + case ax::mojom::Role::kFooterAsNonLandmark: + return QAccessible::Section; case ax::mojom::Role::kForm: return QAccessible::Form; case ax::mojom::Role::kGraphicsDocument: @@ -359,20 +368,23 @@ QAccessible::Role BrowserAccessibilityQt::role() const return QAccessible::Table; case ax::mojom::Role::kGroup: return QAccessible::Grouping; + case ax::mojom::Role::kHeader: + case ax::mojom::Role::kHeaderAsNonLandmark: + return QAccessible::Section; case ax::mojom::Role::kHeading: return QAccessible::Heading; case ax::mojom::Role::kIframe: - return QAccessible::Grouping; + return QAccessible::WebDocument; case ax::mojom::Role::kIframePresentational: - return QAccessible::NoRole; // FIXME + return QAccessible::Grouping; case ax::mojom::Role::kIgnored: return QAccessible::NoRole; case ax::mojom::Role::kImage: return QAccessible::Graphic; case ax::mojom::Role::kImageMap: - return QAccessible::Graphic; + return QAccessible::Document; case ax::mojom::Role::kInlineTextBox: - return QAccessible::EditableText; + return QAccessible::StaticText; case ax::mojom::Role::kInputTime: return QAccessible::SpinBox; case ax::mojom::Role::kKeyboard: @@ -383,8 +395,7 @@ QAccessible::Role BrowserAccessibilityQt::role() const case ax::mojom::Role::kLayoutTableCell: case ax::mojom::Role::kLayoutTableColumn: case ax::mojom::Role::kLayoutTableRow: - // No role description. - return QAccessible::NoRole; + return QAccessible::Section; case ax::mojom::Role::kLegend: return QAccessible::StaticText; case ax::mojom::Role::kLineBreak: @@ -453,24 +464,31 @@ QAccessible::Role BrowserAccessibilityQt::role() const return QAccessible::Grouping; case ax::mojom::Role::kRegion: return QAccessible::Section; + case ax::mojom::Role::kRevision: + return QAccessible::Section; case ax::mojom::Role::kRow: return QAccessible::Row; + case ax::mojom::Role::kRowGroup: + return QAccessible::Section; case ax::mojom::Role::kRowHeader: return QAccessible::RowHeader; case ax::mojom::Role::kRuby: return QAccessible::StaticText; + case ax::mojom::Role::kRubyAnnotation: + return QAccessible::StaticText; case ax::mojom::Role::kScrollBar: return QAccessible::ScrollBar; case ax::mojom::Role::kScrollView: - return QAccessible::NoRole; // FIXME + return QAccessible::Pane; case ax::mojom::Role::kSearch: return QAccessible::Section; case ax::mojom::Role::kSearchBox: return QAccessible::EditableText; + case ax::mojom::Role::kSection: + return QAccessible::Section; case ax::mojom::Role::kSlider: - return QAccessible::Slider; case ax::mojom::Role::kSliderThumb: - return QAccessible::NoRole; // FIXME + return QAccessible::Slider; case ax::mojom::Role::kSpinButton: return QAccessible::SpinBox; case ax::mojom::Role::kSplitter: @@ -479,6 +497,10 @@ QAccessible::Role BrowserAccessibilityQt::role() const return QAccessible::StaticText; case ax::mojom::Role::kStatus: return QAccessible::Indicator; + case ax::mojom::Role::kStrong: + return QAccessible::StaticText; + case ax::mojom::Role::kSuggestion: + return QAccessible::Section; case ax::mojom::Role::kSvgRoot: return QAccessible::Graphic; case ax::mojom::Role::kSwitch: @@ -501,7 +523,7 @@ QAccessible::Role BrowserAccessibilityQt::role() const case ax::mojom::Role::kTimer: return QAccessible::Clock; case ax::mojom::Role::kTitleBar: - return QAccessible::NoRole; // FIXME + return QAccessible::Document; case ax::mojom::Role::kToggleButton: return QAccessible::Button; case ax::mojom::Role::kToolbar: |