Bug 1261471: Remove support for getting mozIDOMWindowProxy via GetInterface. r=mrbkap
authorKyle Huey <khuey@kylehuey.com>
Tue, 05 Apr 2016 20:14:14 -0700
changeset 291852 c7bed3468b5d85f9bf82eb72d1a0b9fbffd6a4fc
parent 291851 472ddbb34a370a4876b3ac3a953b4f0474592a4c
child 291853 d08f6e50f306ccfa2e462d6221044b4ce0748f47
push idunknown
push userunknown
push dateunknown
reviewersmrbkap
bugs1261471
milestone48.0a1
Bug 1261471: Remove support for getting mozIDOMWindowProxy via GetInterface. r=mrbkap
dom/base/nsGlobalWindow.cpp
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -10280,24 +10280,17 @@ nsGlobalWindow::GetIndexedDB(ErrorResult
 //*****************************************************************************
 
 NS_IMETHODIMP
 nsGlobalWindow::GetInterface(const nsIID & aIID, void **aSink)
 {
   NS_ENSURE_ARG_POINTER(aSink);
   *aSink = nullptr;
 
-  if (aIID.Equals(NS_GET_IID(mozIDOMWindowProxy))) {
-    MOZ_ASSERT(IsInnerWindow());
-    nsGlobalWindow* outer = GetOuterWindowInternal();
-    NS_ENSURE_TRUE(outer, NS_ERROR_NOT_INITIALIZED);
-
-    nsCOMPtr<mozIDOMWindowProxy> proxy = outer->AsOuter();
-    proxy.forget(aSink);
-  } else if (aIID.Equals(NS_GET_IID(nsIDocCharset))) {
+  if (aIID.Equals(NS_GET_IID(nsIDocCharset))) {
     nsGlobalWindow* outer = GetOuterWindowInternal();
     NS_ENSURE_TRUE(outer, NS_ERROR_NOT_INITIALIZED);
 
     NS_WARNING("Using deprecated nsIDocCharset: use nsIDocShell.GetCharset() instead ");
     nsCOMPtr<nsIDocCharset> docCharset(do_QueryInterface(outer->mDocShell));
     docCharset.forget(aSink);
   }
   else if (aIID.Equals(NS_GET_IID(nsIWebNavigation))) {