diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-28 11:06:20 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-07-13 11:11:40 +0200 |
commit | 734b635cf9a9316ddd05dc9d9abc0a93746fc7f3 (patch) | |
tree | 49c6736d1c0c792326dd52b7541bea361c478609 /src/core/browser_accessibility_manager_qt.cpp | |
parent | b848c87dbbc317ad7186418a64670b52777d1393 (diff) |
Adaptations for 90-based
Change-Id: I8402b044d8e12d75e144a00984b856f3de10bffd
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
(cherry picked from commit 1d988d971bc4270ba3d148e8e2c143bf8f625b6e)
Diffstat (limited to 'src/core/browser_accessibility_manager_qt.cpp')
-rw-r--r-- | src/core/browser_accessibility_manager_qt.cpp | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/src/core/browser_accessibility_manager_qt.cpp b/src/core/browser_accessibility_manager_qt.cpp index 2d1d9f1ae..b1d7f1a22 100644 --- a/src/core/browser_accessibility_manager_qt.cpp +++ b/src/core/browser_accessibility_manager_qt.cpp @@ -40,30 +40,41 @@ #include "browser_accessibility_manager_qt.h" #include "ui/accessibility/ax_enums.mojom.h" + #include "browser_accessibility_qt.h" +#include "render_widget_host_view_qt.h" using namespace blink; namespace content { -BrowserAccessibilityManager* BrowserAccessibilityManager::Create( - const ui::AXTreeUpdate& initialTree, - BrowserAccessibilityDelegate* delegate) +// static +BrowserAccessibilityManager *BrowserAccessibilityManager::Create( + const ui::AXTreeUpdate &initialTree, + BrowserAccessibilityDelegate *delegate) { #if QT_CONFIG(accessibility) - return new BrowserAccessibilityManagerQt(nullptr, initialTree, delegate); + Q_ASSERT(delegate); + QObject *parent = nullptr; + if (delegate->AccessibilityIsMainFrame()) { + auto *access = static_cast<QtWebEngineCore::WebContentsAccessibilityQt *>(delegate->AccessibilityGetWebContentsAccessibility()); + parent = access ? access->accessibilityParentObject() : nullptr; + } + return new BrowserAccessibilityManagerQt(parent, initialTree, delegate); #else return nullptr; #endif // QT_CONFIG(accessibility) } -BrowserAccessibility *BrowserAccessibility::Create() +// static +BrowserAccessibilityManager *BrowserAccessibilityManager::Create( + BrowserAccessibilityDelegate *delegate) { #if QT_CONFIG(accessibility) - return new BrowserAccessibilityQt(); + return BrowserAccessibilityManager::Create(BrowserAccessibilityManagerQt::GetEmptyDocument(), delegate); #else return nullptr; -#endif // QT_CONFIG(accessibility) +#endif } #if QT_CONFIG(accessibility) |