wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 802366 - Prelude, part 2: Rename GetParentIgnoreBrowserFrame to GetSameTypeParentIgnoreBrowserAndAppBoundaries. r=bz

Browse Source 
It's a long name, but at least it's clear.
This commit is contained in:
Justin Lebar 2012-11-09 16:37:38 -08:00
parent 6a364c5f37
commit 12e843ccbd
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docshell/base/nsDocShell.cpp
View File

@ -2830,7 +2830,7 @@ nsDocShell::GetSameTypeParent(nsIDocShellTreeItem ** aParent)
}
NS_IMETHODIMP
nsDocShell::GetParentIgnoreBrowserFrame(nsIDocShell** aParent)
nsDocShell::GetSameTypeParentIgnoreBrowserAndAppBoundaries(nsIDocShell** aParent)
{
NS_ENSURE_ARG_POINTER(aParent);
*aParent = nullptr;
@ -12442,7 +12442,7 @@ nsDocShell::GetAppId(uint32_t* aAppId)
MOZ_ASSERT(GetFrameType() != eFrameTypeApp);
nsCOMPtr<nsIDocShell> parent;
GetParentIgnoreBrowserFrame(getter_AddRefs(parent));
GetSameTypeParentIgnoreBrowserAndAppBoundaries(getter_AddRefs(parent));
if (!parent) {
*aAppId = nsIScriptSecurityManager::NO_APP_ID;

14
docshell/base/nsIDocShell.idl
View File

@ -39,7 +39,7 @@ interface nsIWebBrowserPrint;
interface nsIVariant;
interface nsIPrivacyTransitionObserver;
[scriptable, builtinclass, uuid(e93b2f6a-c543-448b-9239-55c96e31672e)]
[scriptable, builtinclass, uuid(0132C0BE-ACB5-4D61-9B19-01C005E030DA)]
interface nsIDocShell : nsISupports
{
/**
@ -647,10 +647,10 @@ interface nsIDocShell : nsISupports
[noscript] void setAppId(in unsigned long appId);
/**
* Returns the app id of the app the docshell is in. Returns
* nsIScriptSecurityManager::NO_APP_ID if the docshell is not in an app.
* Like nsIDocShellTreeItem::GetSameTypeParent, except this ignores <iframe
* mozbrowser> and <iframe mozapp> boundaries.
*/
[infallible] readonly attribute unsigned long appId;
nsIDocShell getSameTypeParentIgnoreBrowserAndAppBoundaries();
/**
* True iff asynchronous panning and zooming is enabled for this
@ -658,12 +658,6 @@ interface nsIDocShell : nsISupports
*/
readonly attribute bool asyncPanZoomEnabled;
/**
* Like GetSameTypeParent, except this ignores <iframe mozbrowser>
* boundaries.
*/
nsIDocShell getParentIgnoreBrowserFrame();
/**
* The sandbox flags on the docshell. These reflect the value of the sandbox
* attribute of the associated IFRAME or CSP-protectable content, if

4
dom/base/nsGlobalWindow.cpp
View File

@ -2948,7 +2948,7 @@ nsGlobalWindow::GetRealParent(nsIDOMWindow** aParent)
}
nsCOMPtr<nsIDocShell> parent;
mDocShell->GetParentIgnoreBrowserFrame(getter_AddRefs(parent));
mDocShell->GetSameTypeParentIgnoreBrowserAndAppBoundaries(getter_AddRefs(parent));
if (parent) {
nsCOMPtr<nsIScriptGlobalObject> globalObject(do_GetInterface(parent));
@ -7039,7 +7039,7 @@ nsGlobalWindow::GetRealFrameElement(nsIDOMElement** aFrameElement)
}
nsCOMPtr<nsIDocShell> parent;
mDocShell->GetParentIgnoreBrowserFrame(getter_AddRefs(parent));
mDocShell->GetSameTypeParentIgnoreBrowserAndAppBoundaries(getter_AddRefs(parent));
if (!parent || parent == mDocShell) {
// We're at a chrome boundary, don't expose the chrome iframe