Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 14:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 783644 - Part 2: If we're inside <iframe mozbrowser>, ignore the dialog=1 feature in window.open. r=smaug

Browse Source
This commit is contained in:
Justin Lebar 2012-08-20 09:30:08 -07:00
parent e6aa23927e
commit ba3252b24e
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
embedding/components/windowwatcher/src/nsWindowWatcher.cpp
View File

@ -548,7 +548,7 @@ nsWindowWatcher::OpenWindowInternal(nsIDOMWindow *aParent,
// callee context onto the context stack so that
// CalculateChromeFlags() sees the actual caller when doing its
// security checks.
chromeFlags = CalculateChromeFlags(features.get(), featuresSpecified,
chromeFlags = CalculateChromeFlags(aParent, features.get(), featuresSpecified,
aDialog, uriToLoadIsChrome,
hasChromeParent);
@ -1414,6 +1414,7 @@ nsWindowWatcher::URIfromURL(const char *aURL,
/**
* Calculate the chrome bitmask from a string list of features.
* @param aParent the opener window
* @param aFeatures a string containing a list of named chrome features
* @param aNullFeatures true if aFeatures was a null pointer (which fact
* is lost by its conversion to a string in the caller)
@ -1421,7 +1422,8 @@ nsWindowWatcher::URIfromURL(const char *aURL,
* @return the chrome bitmask
*/
// static
PRUint32 nsWindowWatcher::CalculateChromeFlags(const char *aFeatures,
PRUint32 nsWindowWatcher::CalculateChromeFlags(nsIDOMWindow *aParent,
const char *aFeatures,
bool aFeaturesSpecified,
bool aDialog,
bool aChromeURL,
@ -1590,6 +1592,17 @@ PRUint32 nsWindowWatcher::CalculateChromeFlags(const char *aFeatures,
chromeFlags &= ~nsIWebBrowserChrome::CHROME_DEPENDENT;
}
// Disable CHROME_OPENAS_DIALOG if the window is inside <iframe mozbrowser>.
// It's up to the embedder to interpret what dialog=1 means.
nsCOMPtr<nsIDocShell> docshell = do_GetInterface(aParent);
if (docshell) {
bool belowContentBoundary = false;
docshell->GetIsBelowContentBoundary(&belowContentBoundary);
if (belowContentBoundary) {
chromeFlags &= ~nsIWebBrowserChrome::CHROME_OPENAS_DIALOG;
}
}
return chromeFlags;
}

3
embedding/components/windowwatcher/src/nsWindowWatcher.h
View File

@ -88,7 +88,8 @@ protected:
nsIDOMWindow *aParent,
nsIURI **aURI);
static PRUint32 CalculateChromeFlags(const char *aFeatures,
static PRUint32 CalculateChromeFlags(nsIDOMWindow *aParent,
const char *aFeatures,
bool aFeaturesSpecified,
bool aDialog,
bool aChromeURL,