author | Kyle Huey <khuey@kylehuey.com> |
Wed, 22 Jul 2015 10:14:03 +0800 | |
changeset 254056 | 6ad92b48085b5ec5532f14e0b9e3c5eb15ad9fa8 |
parent 254055 | 35c6e7e9c205be0656c050909aaa3b42fa064c4f |
child 254057 | cfc312d8ef205bcb6a58b840459a4ccd922dcf88 |
push id | 29087 |
push user | cbook@mozilla.com |
push date | Wed, 22 Jul 2015 12:01:23 +0000 |
treeherder | mozilla-central@e7434cafdf2f [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bz |
bugs | 1185793 |
milestone | 42.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
|
--- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -3773,20 +3773,20 @@ nsGlobalWindow::GetParent(ErrorResult& a * * In contrast to GetRealParent, GetScriptableParent respects <iframe * mozbrowser> boundaries, so if |this| is contained by an <iframe * mozbrowser>, we will return |this| as its own parent. */ NS_IMETHODIMP nsGlobalWindow::GetScriptableParent(nsIDOMWindow** aParent) { - FORWARD_TO_INNER(GetScriptableParent, (aParent), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - nsCOMPtr<nsIDOMWindow> parent = GetParent(rv); + FORWARD_TO_OUTER(GetScriptableParent, (aParent), NS_ERROR_UNEXPECTED); + + ErrorResult rv; + nsCOMPtr<nsIDOMWindow> parent = GetParentOuter(rv); parent.forget(aParent); return rv.StealNSResult(); } /** * nsIDOMWindow::GetParent (when called from C++) is just a wrapper around * GetRealParent.