diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-25 15:33:01 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-25 14:41:02 +0000 |
| commit | 448478729cfdf5098dd24a6a870bacdbcd8cf9a7 (patch) | |
| tree | 546386ed2957dfc39725180a992191745dbef177 /src/core/browser_accessibility_qt.cpp | |
| parent | 5ab157588214bfbbc1d1f258a461b1cab4cc3991 (diff) | |
Adaptations for Chromium 62
Change-Id: I49cd3c419d4dd1180144c3c07bdd9a628ab73caa
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/browser_accessibility_qt.cpp')
| -rw-r--r-- | src/core/browser_accessibility_qt.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/core/browser_accessibility_qt.cpp b/src/core/browser_accessibility_qt.cpp index e31951307..1c96ac538 100644 --- a/src/core/browser_accessibility_qt.cpp +++ b/src/core/browser_accessibility_qt.cpp @@ -214,8 +214,6 @@ QAccessible::Role BrowserAccessibilityQt::role() const return QAccessible::Section; case ui::AX_ROLE_BLOCKQUOTE: return QAccessible::Section; - case ui::AX_ROLE_BUSY_INDICATOR: - return QAccessible::NoRole; // This is unused and planned to be removed. case ui::AX_ROLE_BUTTON: return QAccessible::Button; case ui::AX_ROLE_BUTTON_DROP_DOWN: @@ -297,8 +295,6 @@ QAccessible::Role BrowserAccessibilityQt::role() const return QAccessible::Graphic; case ui::AX_ROLE_IMAGE_MAP: return QAccessible::Graphic; - case ui::AX_ROLE_IMAGE_MAP_LINK: - return QAccessible::Link; case ui::AX_ROLE_INLINE_TEXT_BOX: return QAccessible::EditableText; case ui::AX_ROLE_INPUT_TIME: @@ -355,8 +351,6 @@ QAccessible::Role BrowserAccessibilityQt::role() const return QAccessible::Section; case ui::AX_ROLE_NOTE: return QAccessible::Note; - case ui::AX_ROLE_OUTLINE: - return QAccessible::Tree; case ui::AX_ROLE_PANE: return QAccessible::Pane; case ui::AX_ROLE_PARAGRAPH: @@ -381,14 +375,8 @@ QAccessible::Role BrowserAccessibilityQt::role() const return QAccessible::RowHeader; case ui::AX_ROLE_RUBY: return QAccessible::StaticText; - case ui::AX_ROLE_RULER: - return QAccessible::NoRole; // FIXME - case ui::AX_ROLE_SCROLL_AREA: - return QAccessible::Client; // FIXME case ui::AX_ROLE_SCROLL_BAR: return QAccessible::ScrollBar; - case ui::AX_ROLE_SEAMLESS_WEB_AREA: - return QAccessible::NoRole; // FIXME case ui::AX_ROLE_SEARCH: return QAccessible::Section; case ui::AX_ROLE_SEARCH_BOX: @@ -417,8 +405,6 @@ QAccessible::Role BrowserAccessibilityQt::role() const return QAccessible::Section; case ui::AX_ROLE_TAB: return QAccessible::PageTab; - case ui::AX_ROLE_TAB_GROUP: // blink doesn't use (uses ROLE_TAB_LIST) - return QAccessible::NoRole; // FIXME case ui::AX_ROLE_TAB_LIST: return QAccessible::PageTabList; case ui::AX_ROLE_TAB_PANEL: @@ -456,8 +442,6 @@ QAccessible::State BrowserAccessibilityQt::state() const { QAccessible::State state = QAccessible::State(); int32_t s = GetState(); - if (s & (1 << ui::AX_STATE_BUSY)) - state.busy = true; if (s & (1 << ui::AX_STATE_COLLAPSED)) state.collapsed = true; if (s & (1 << ui::AX_STATE_DEFAULT)) @@ -497,6 +481,8 @@ QAccessible::State BrowserAccessibilityQt::state() const if (manager()->GetFocus() == this) state.focused = true; + if (GetBoolAttribute(ui::AX_ATTR_BUSY)) + state.busy = true; if (HasIntAttribute(ui::AX_ATTR_CHECKED_STATE)) { ui::AXCheckedState checkedState = (ui::AXCheckedState)GetIntAttribute(ui::AX_ATTR_CHECKED_STATE); switch (checkedState) { |