From 40a355a42d4a9444dc753c04c6608dade2f06a23 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:27 +0200
Subject: Adding upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 dom/base/InProcessBrowserChildMessageManager.cpp | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

(limited to 'dom/base/InProcessBrowserChildMessageManager.cpp')

diff --git a/dom/base/InProcessBrowserChildMessageManager.cpp b/dom/base/InProcessBrowserChildMessageManager.cpp
index 191ec9f7b5..830c57591b 100644
--- a/dom/base/InProcessBrowserChildMessageManager.cpp
+++ b/dom/base/InProcessBrowserChildMessageManager.cpp
@@ -13,7 +13,6 @@
 #include "nsFrameLoaderOwner.h"
 #include "nsQueryObject.h"
 #include "xpcpublic.h"
-#include "nsIMozBrowserFrame.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/dom/ChromeMessageSender.h"
 #include "mozilla/dom/Document.h"
@@ -100,15 +99,6 @@ InProcessBrowserChildMessageManager::InProcessBrowserChildMessageManager(
       mOwner(aOwner),
       mChromeMessageManager(aChrome) {
   mozilla::HoldJSObjects(this);
-
-  // If owner corresponds to an <iframe mozbrowser>, we'll have to tweak our
-  // GetEventTargetParent implementation.
-  nsCOMPtr<nsIMozBrowserFrame> browserFrame = do_QueryInterface(mOwner);
-  if (browserFrame) {
-    mIsBrowserFrame = browserFrame->GetReallyIsBrowser();
-  } else {
-    mIsBrowserFrame = false;
-  }
 }
 
 InProcessBrowserChildMessageManager::~InProcessBrowserChildMessageManager() {
@@ -236,19 +226,7 @@ void InProcessBrowserChildMessageManager::GetEventTargetParent(
     return;
   }
 
-  if (mIsBrowserFrame &&
-      (!mOwner || !nsContentUtils::IsInChromeDocshell(mOwner->OwnerDoc()))) {
-    if (mOwner) {
-      if (nsPIDOMWindowInner* innerWindow =
-              mOwner->OwnerDoc()->GetInnerWindow()) {
-        // 'this' is already a "chrome handler", so we consider window's
-        // parent target to be part of that same part of the event path.
-        aVisitor.SetParentTarget(innerWindow->GetParentTarget(), false);
-      }
-    }
-  } else {
-    aVisitor.SetParentTarget(mOwner, false);
-  }
+  aVisitor.SetParentTarget(mOwner, false);
 }
 
 class nsAsyncScriptLoad : public Runnable {
-- 
cgit v1.2.3