mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Backed out changeset 7fa2f2eff658 (bug 806127)
This commit is contained in:
parent
14dffb1cbe
commit
474f67107e
@ -115,9 +115,7 @@ ThirdPartyUtil::IsThirdPartyWindow(nsIDOMWindow* aWindow,
|
|||||||
nsCOMPtr<nsIDOMWindow> current = aWindow, parent;
|
nsCOMPtr<nsIDOMWindow> current = aWindow, parent;
|
||||||
nsCOMPtr<nsIURI> parentURI;
|
nsCOMPtr<nsIURI> parentURI;
|
||||||
do {
|
do {
|
||||||
// We use GetScriptableParent rather than GetParent because we consider
|
rv = current->GetParent(getter_AddRefs(parent));
|
||||||
// <iframe mozbrowser/mozapp> to be a top-level frame.
|
|
||||||
rv = current->GetScriptableParent(getter_AddRefs(parent));
|
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
if (SameCOMIdentity(parent, current)) {
|
if (SameCOMIdentity(parent, current)) {
|
||||||
@ -212,9 +210,7 @@ ThirdPartyUtil::IsThirdPartyChannel(nsIChannel* aChannel,
|
|||||||
ctx->GetAssociatedWindow(getter_AddRefs(ourWin));
|
ctx->GetAssociatedWindow(getter_AddRefs(ourWin));
|
||||||
if (!ourWin) return NS_ERROR_INVALID_ARG;
|
if (!ourWin) return NS_ERROR_INVALID_ARG;
|
||||||
|
|
||||||
// We use GetScriptableParent rather than GetParent because we consider
|
ourWin->GetParent(getter_AddRefs(parentWin));
|
||||||
// <iframe mozbrowser/mozapp> to be a top-level frame.
|
|
||||||
ourWin->GetScriptableParent(getter_AddRefs(parentWin));
|
|
||||||
NS_ENSURE_TRUE(parentWin, NS_ERROR_INVALID_ARG);
|
NS_ENSURE_TRUE(parentWin, NS_ERROR_INVALID_ARG);
|
||||||
|
|
||||||
// Check whether this is the document channel for this window (representing a
|
// Check whether this is the document channel for this window (representing a
|
||||||
|
Loading…
Reference in New Issue
Block a user