diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-17 17:37:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-25 15:55:54 +0000 |
| commit | 32b67aea15fdf47d6b86e1e5303d25ec6e8ded37 (patch) | |
| tree | bf43f9840d1313349de4ca6cdc8ff96f5dfa2202 /src/core/browser_accessibility_qt.cpp | |
| parent | 57fa7e51c52d8f4608846818eb312ac1c445fa64 (diff) | |
Add accessibility_tree_formatter_qt
Needed by chrome://accessibility
Updates chromium to related change:
224fc0748a Do not assert on --disable-gpu
0ba5e6626a FIXUP: Add ifdefs to exclude ATL and accessibility from the build
Change-Id: Ida0b03048ab6aa04686251d16ccfbf4855a37690
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/core/browser_accessibility_qt.cpp')
| -rw-r--r-- | src/core/browser_accessibility_qt.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/core/browser_accessibility_qt.cpp b/src/core/browser_accessibility_qt.cpp index a19eff618..a672ccc06 100644 --- a/src/core/browser_accessibility_qt.cpp +++ b/src/core/browser_accessibility_qt.cpp @@ -56,6 +56,11 @@ using QtWebEngineCore::toQt; namespace content { +const BrowserAccessibilityQt *ToBrowserAccessibilityQt(const BrowserAccessibility *obj) +{ + return static_cast<const BrowserAccessibilityQt *>(obj); +} + BrowserAccessibilityQt::BrowserAccessibilityQt() { QAccessible::registerAccessibleInterface(this); @@ -518,11 +523,11 @@ QAccessible::State BrowserAccessibilityQt::state() const if (HasState(ax::mojom::State::kLinked)) state.linked = true; if (HasState(ax::mojom::State::kMultiline)) - {} // FIXME: state.multiLine = true; + state.multiLine = true; if (HasState(ax::mojom::State::kMultiselectable)) state.multiSelectable = true; if (HasState(ax::mojom::State::kProtected)) - {} // FIXME + state.passwordEdit = true; if (HasState(ax::mojom::State::kRequired)) {} // FIXME if (HasState(ax::mojom::State::kRichlyEditable)) @@ -530,7 +535,7 @@ QAccessible::State BrowserAccessibilityQt::state() const if (HasState(ax::mojom::State::kVertical)) {} // FIXME if (HasState(ax::mojom::State::kVisited)) - {} // FIXME + state.traversed = true; if (IsOffscreen()) state.offscreen = true; @@ -538,11 +543,14 @@ QAccessible::State BrowserAccessibilityQt::state() const state.focused = true; if (GetBoolAttribute(ax::mojom::BoolAttribute::kBusy)) state.busy = true; + if (GetBoolAttribute(ax::mojom::BoolAttribute::kModal)) + state.modal = true; if (HasBoolAttribute(ax::mojom::BoolAttribute::kSelected)) { state.selectable = true; state.selected = GetBoolAttribute(ax::mojom::BoolAttribute::kSelected); } if (HasIntAttribute(ax::mojom::IntAttribute::kCheckedState)) { + state.checkable = true; const ax::mojom::CheckedState checkedState = static_cast<ax::mojom::CheckedState>(GetIntAttribute(ax::mojom::IntAttribute::kCheckedState)); switch (checkedState) { |