diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-23 18:26:28 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-22 08:47:19 +0000 |
| commit | c0419ae89fbc4fbdc58aef5b8b01ab0b45f8ff98 (patch) | |
| tree | d0bdc1f0ef144bb63ed75b8e6fcfb6f039628210 /src/core/browser_accessibility_qt.cpp | |
| parent | 1e89fa4226be870d97d3b21c6c7087886c81bbc5 (diff) | |
Adaptations for Chromium 68
Together-with: Tamas Zakor<ztamas@inf.u-szeged.hu>
Change-Id: I805246b6f01cb151fff48588744408c676d87c14
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/browser_accessibility_qt.cpp')
| -rw-r--r-- | src/core/browser_accessibility_qt.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/core/browser_accessibility_qt.cpp b/src/core/browser_accessibility_qt.cpp index 5ec84affb..c7bf9510d 100644 --- a/src/core/browser_accessibility_qt.cpp +++ b/src/core/browser_accessibility_qt.cpp @@ -382,6 +382,8 @@ QAccessible::Role BrowserAccessibilityQt::role() const return QAccessible::StaticText; case ax::mojom::Role::kScrollBar: return QAccessible::ScrollBar; + case ax::mojom::Role::kScrollView: + return QAccessible::NoRole; // FIXME case ax::mojom::Role::kSearch: return QAccessible::Section; case ax::mojom::Role::kSearchBox: @@ -392,8 +394,6 @@ QAccessible::Role BrowserAccessibilityQt::role() const return QAccessible::NoRole; // FIXME case ax::mojom::Role::kSpinButton: return QAccessible::SpinBox; - case ax::mojom::Role::kSpinButtonPart: - return QAccessible::NoRole; // FIXME case ax::mojom::Role::kSplitter: return QAccessible::Splitter; case ax::mojom::Role::kStaticText: @@ -456,7 +456,7 @@ QAccessible::State BrowserAccessibilityQt::state() const state.expanded = true; if (HasState(ax::mojom::State::kFocusable)) state.focusable = true; - if (HasState(ax::mojom::State::kHaspopup)) + if (HasState(ax::mojom::State::kHasPopup)) state.hasPopup = true; if (HasState(ax::mojom::State::kHorizontal)) {} // FIXME @@ -711,10 +711,7 @@ QAccessibleInterface *BrowserAccessibilityQt::cellAt(int row, int column) const if (row < 0 || row >= rows || column < 0 || column >= columns) return 0; - const std::vector<int32_t>& cell_ids = GetIntListAttribute(ax::mojom::IntListAttribute::kCellIds); - DCHECK_EQ(columns * rows, static_cast<int>(cell_ids.size())); - - int cell_id = cell_ids[row * columns + column]; + int cell_id = GetCellId(row, column); BrowserAccessibility* cell = manager()->GetFromID(cell_id); if (cell) { QAccessibleInterface *iface = static_cast<BrowserAccessibilityQt*>(cell); |