From dd06472de7bc49c2b48f7438b1eb21a64f891486 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Mon, 12 Jul 2021 02:56:48 +0000
Subject: [PATCH] Issue #1792 - Part 2: Move GetParentObject() to EventTarget.h
 for re-use.

---
 dom/events/DOMEventTargetHelper.h | 5 +----
 dom/events/EventTarget.h          | 6 ++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dom/events/DOMEventTargetHelper.h b/dom/events/DOMEventTargetHelper.h
index 63f3598048..9a1938078d 100644
--- a/dom/events/DOMEventTargetHelper.h
+++ b/dom/events/DOMEventTargetHelper.h
@@ -146,10 +146,7 @@ public:
   void BindToOwner(nsPIDOMWindowInner* aOwner);
   void BindToOwner(DOMEventTargetHelper* aOther);
   virtual void DisconnectFromOwner();                   
-  nsIGlobalObject* GetParentObject() const
-  {
-    return GetOwnerGlobal();
-  }
+  using EventTarget::GetParentObject;
   virtual nsIGlobalObject* GetOwnerGlobal() const override
   {
     nsCOMPtr<nsIGlobalObject> parentObject = do_QueryReferent(mParentObject);
diff --git a/dom/events/EventTarget.h b/dom/events/EventTarget.h
index c64296993b..9e5d1e7653 100644
--- a/dom/events/EventTarget.h
+++ b/dom/events/EventTarget.h
@@ -26,6 +26,7 @@ class Event;
 class EventListener;
 class EventListenerOptionsOrBoolean;
 class EventHandlerNonNull;
+class GlobalObject;
 
 template <class T> struct Nullable;
 
@@ -55,6 +56,11 @@ public:
                                    ErrorResult& aRv);
   bool DispatchEvent(JSContext* aCx, Event& aEvent, ErrorResult& aRv);
 
+  nsIGlobalObject* GetParentObject() const
+  {
+    return GetOwnerGlobal();
+  }
+
   // Note, this takes the type in onfoo form!
   EventHandlerNonNull* GetEventHandler(const nsAString& aType)
   {