Bug 927901, bind .crypto to inner, not outer window, r=khuey
authorOlli Pettay <Olli.Pettay@helsinki.fi>
Thu, 24 Oct 2013 19:25:39 +0300
changeset 165804 692a1de5331088e9070bb2d6c85c0f7851d8a82a
parent 165803 cf2089a7c924278ef0a1a2bb4b5e687a1170edac
child 165805 c38d71ed04633d138b780fa802ded02a3ce59b96
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs927901
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 927901, bind .crypto to inner, not outer window, r=khuey
dom/base/nsGlobalWindow.cpp
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -3872,17 +3872,17 @@ nsGlobalWindow::GetApplicationCache(nsID
   NS_IF_ADDREF(*aApplicationCache = mApplicationCache);
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsGlobalWindow::GetCrypto(nsIDOMCrypto** aCrypto)
 {
-  FORWARD_TO_OUTER(GetCrypto, (aCrypto), NS_ERROR_NOT_INITIALIZED);
+  FORWARD_TO_INNER(GetCrypto, (aCrypto), NS_ERROR_NOT_INITIALIZED);
 
   if (!mCrypto) {
 #ifndef MOZ_DISABLE_CRYPTOLEGACY
     if (XRE_GetProcessType() != GeckoProcessType_Content) {
       nsresult rv;
       mCrypto = do_CreateInstance(NS_CRYPTO_CONTRACTID, &rv);
       NS_ENSURE_SUCCESS(rv, rv);
     } else