corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 862918 - Only create nsGlobalModalWindow for the primary content shell. r=bz

Browse Source
This commit is contained in:
Bobby Holley
2013-04-19 09:49:56 -04:00
parent 5c87cd932d
commit 1520f90dab
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docshell/base/nsDocShell.cpp
View File

@@ -11418,6 +11418,15 @@ nsDocShell::EnsureScriptEnvironment()
bool isModalContentWindow = (mItemType == typeContent) && bool isModalContentWindow = (mItemType == typeContent) &&
(chromeFlags & nsIWebBrowserChrome::CHROME_MODAL); (chromeFlags & nsIWebBrowserChrome::CHROME_MODAL);
// There can be various other content docshells associated with the
// top-level window, like sidebars. Make sure that we only create an
// nsGlobalModalWindow for the primary content shell.
if (isModalContentWindow) {
nsCOMPtr<nsIDocShellTreeItem> primaryItem;
nsresult rv = mTreeOwner->GetPrimaryContentShell(getter_AddRefs(primaryItem));
NS_ENSURE_SUCCESS(rv, rv);
isModalContentWindow = (primaryItem == this);
}
// If our window is modal and we're not opened as chrome, make // If our window is modal and we're not opened as chrome, make
// this window a modal content window. // this window a modal content window.