Bug 1596488 - Revert mXBLAttached fix for native OSX menus r=spohl

Differential Revision: https://phabricator.services.mozilla.com/D61084

--HG--
extra : moz-landing-system : lando

widget/cocoa/nsMenuX.h

@@ -93,7 +93,6 @@ class nsMenuX : public nsMenuObjectX, public nsChangeObserver {
   bool mNeedsRebuild;
   bool mConstructed;
   bool mVisible;
-  bool mXBLAttached;
 };
 
 #endif  // nsMenuX_h_

widget/cocoa/nsMenuX.mm

@@ -35,11 +35,6 @@
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/EventDispatcher.h"
 
-#include "jsapi.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsIScriptContext.h"
-#include "nsIXPConnect.h"
-
 #include "mozilla/MouseEvents.h"
 
 using namespace mozilla;
@@ -95,8 +90,7 @@ nsMenuX::nsMenuX()
       mDestroyHandlerCalled(false),
       mNeedsRebuild(true),
       mConstructed(false),
-      mVisible(true),
-      mXBLAttached(false) {
+      mVisible(true) {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
   if (!gMenuMethodsSwizzled) {
@@ -390,20 +384,6 @@ void nsMenuX::MenuConstruct() {
     return;
   }
 
-  // bug 365405: Manually wrap the menupopup node to make sure it's bounded
-  if (!mXBLAttached) {
-    nsCOMPtr<nsIXPConnect> xpconnect = nsIXPConnect::XPConnect();
-    dom::Document* ownerDoc = menuPopup->OwnerDoc();
-    dom::AutoJSAPI jsapi;
-    if (ownerDoc && jsapi.Init(ownerDoc->GetInnerWindow())) {
-      JSContext* cx = jsapi.cx();
-      JS::RootedObject ignoredObj(cx);
-      xpconnect->WrapNative(cx, JS::CurrentGlobalOrNull(cx), menuPopup, NS_GET_IID(nsISupports),
-                            ignoredObj.address());
-      mXBLAttached = true;
-    }
-  }
-
   // Iterate over the kids
   for (nsIContent* child = menuPopup->GetFirstChild(); child; child = child->GetNextSibling()) {
     // depending on the type, create a menu item, separator, or submenu