tor-browser

commit 2fa8cf93bd86d9e32c8350030d24e18a6a505f44
parent 9d8e0687edaad0ccdcf4c1c84f08bb1e790024dd
Author: agoloman <agoloman@mozilla.com>
Date:   Wed, 19 Nov 2025 19:02:59 +0200

Revert "Bug 1996506 - Don't climb above document in GetNonGenericParent. r=Jamie" for causing mass failures.

This reverts commit ec0aa566fa19398f7157fd77da8258599c5d91fe.

Diffstat:
M
accessible/basetypes/Accessible.h
 | 
5
++---
M
accessible/ipc/DocAccessibleParent.h
 | 
7
+------

2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/accessible/basetypes/Accessible.h b/accessible/basetypes/Accessible.h
@@ -705,12 +705,11 @@ class Accessible {
   }
 
   /**
-   * Returns the nearest ancestor in the document which is not a generic
-   * element.
+   * Returns the nearest ancestor which is not a generic element.
    */
   Accessible* GetNonGenericParent() const {
     for (Accessible* parent = Parent(); parent; parent = parent->Parent()) {
-      if (parent->IsDoc() || !parent->IsGeneric()) {
+      if (!parent->IsGeneric()) {
         return parent;
       }
     }
diff --git a/accessible/ipc/DocAccessibleParent.h b/accessible/ipc/DocAccessibleParent.h
@@ -233,12 +233,7 @@ class DocAccessibleParent : public RemoteAccessible,
   // Accessible
   virtual Accessible* Parent() const override {
     if (IsTopLevel()) {
-      if (NS_IsMainThread()) {
-        return OuterDocOfRemoteBrowser();
-      } else {
-        MOZ_ASSERT_UNREACHABLE("Getting local parent off main thread!");
-        return nullptr;
-      }
+      return OuterDocOfRemoteBrowser();
     }
     return RemoteParent();
   }