Bug 1507604 - Remove nsPIDOMWindowInner::GetPrivateRoot. r=smaug

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

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

dom/base/nsGlobalWindowInner.cpp

@@ -4390,17 +4390,6 @@ nsGlobalWindowInner::GetExistingListenerManager() const
 // nsGlobalWindowInner::nsPIDOMWindow
 //*****************************************************************************
 
-nsPIDOMWindowOuter*
-nsGlobalWindowInner::GetPrivateRoot()
-{
-  nsGlobalWindowOuter* outer = GetOuterWindowInternal();
-  if (!outer) {
-    NS_WARNING("No outer window available!");
-    return nullptr;
-  }
-  return outer->GetPrivateRoot();
-}
-
 Location*
 nsGlobalWindowInner::GetLocation()
 {

dom/base/nsGlobalWindowInner.h

@@ -339,9 +339,6 @@ public:
 
   nsresult PostHandleEvent(mozilla::EventChainPostVisitor& aVisitor) override;
 
-  // nsPIDOMWindow
-  virtual nsPIDOMWindowOuter* GetPrivateRoot() override;
-
   // Outer windows only.
   virtual bool IsTopLevelWindowActive() override;
 

dom/base/nsPIDOMWindow.h

@@ -354,8 +354,6 @@ public:
 
   mozilla::dom::TabGroup* TabGroup();
 
-  virtual nsPIDOMWindowOuter* GetPrivateRoot() = 0;
-
   virtual mozilla::dom::CustomElementRegistry* CustomElements() = 0;
 
   // XXX: This is called on inner windows

dom/xbl/nsXBLPrototypeHandler.cpp

@@ -321,10 +321,9 @@ nsXBLPrototypeHandler::ExecuteHandler(EventTarget* aTarget,
   nsCOMPtr<nsPIWindowRoot> winRoot = do_QueryInterface(aTarget);
   if (winRoot) {
     if (nsCOMPtr<nsPIDOMWindowOuter> window = winRoot->GetWindow()) {
-      nsPIDOMWindowInner* innerWindow = window->GetCurrentInnerWindow();
-      NS_ENSURE_TRUE(innerWindow, NS_ERROR_UNEXPECTED);
+      NS_ENSURE_TRUE(window->GetCurrentInnerWindow(), NS_ERROR_UNEXPECTED);
 
-      boundGlobal = do_QueryInterface(innerWindow->GetPrivateRoot());
+      boundGlobal = do_QueryInterface(window->GetPrivateRoot());
     }
   }
   else boundGlobal = do_QueryInterface(aTarget);