1 files changed, 15 insertions, 9 deletions
diff --git a/src/core/browser_accessibility_manager_qt.cpp b/src/core/browser_accessibility_manager_qt.cpp
index b1d7f1a22..8587229d1 100644
--- a/src/core/browser_accessibility_manager_qt.cpp
+++ b/src/core/browser_accessibility_manager_qt.cpp
@@ -55,12 +55,9 @@ BrowserAccessibilityManager *BrowserAccessibilityManager::Create(
 {
 #if QT_CONFIG(accessibility)
     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);
+    QtWebEngineCore::WebContentsAccessibilityQt *access = nullptr;
+    access = static_cast<QtWebEngineCore::WebContentsAccessibilityQt *>(delegate->AccessibilityGetWebContentsAccessibility());
+    return new BrowserAccessibilityManagerQt(access, initialTree, delegate);
 #else
     return nullptr;
 #endif // QT_CONFIG(accessibility)
@@ -79,10 +76,11 @@ BrowserAccessibilityManager *BrowserAccessibilityManager::Create(
 
 #if QT_CONFIG(accessibility)
 BrowserAccessibilityManagerQt::BrowserAccessibilityManagerQt(
-    QObject *parentObject, const ui::AXTreeUpdate &initialTree,
+    QtWebEngineCore::WebContentsAccessibilityQt *webContentsAccessibility,
+    const ui::AXTreeUpdate &initialTree,
     BrowserAccessibilityDelegate* delegate)
       : BrowserAccessibilityManager(delegate)
-      , m_parentObject(parentObject)
+      , m_webContentsAccessibility(webContentsAccessibility)
 {
     Initialize(initialTree);
     m_valid = true; // BrowserAccessibilityQt can start using the AXTree
@@ -95,7 +93,15 @@ BrowserAccessibilityManagerQt::~BrowserAccessibilityManagerQt()
 
 QAccessibleInterface *BrowserAccessibilityManagerQt::rootParentAccessible()
 {
-    return QAccessible::queryAccessibleInterface(m_parentObject);
+    content::BrowserAccessibility *parent_node = GetParentNodeFromParentTree();
+    if (!parent_node) {
+        Q_ASSERT(m_webContentsAccessibility);
+        return QAccessible::queryAccessibleInterface(m_webContentsAccessibility->accessibilityParentObject());
+    }
+
+    auto *parent_manager =
+            static_cast<BrowserAccessibilityManagerQt *>(parent_node->manager());
+    return parent_manager->rootParentAccessible();
 }
 
 void BrowserAccessibilityManagerQt::FireBlinkEvent(ax::mojom::Event event_type,