Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset c47a46c92dff (bug 860941)

Browse Source
This commit is contained in:
Ed Morley 2013-05-17 09:08:52 +01:00
parent e14725b05d
commit 82084f4767
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docshell/base/nsDocShell.cpp
View File

@ -11452,7 +11452,7 @@ nsDocShell::EnsureScriptEnvironment()
browserChrome->GetChromeFlags(&chromeFlags);
bool isModalContentWindow = (mItemType == typeContent) &&
(chromeFlags & nsIWebBrowserChrome::CHROME_MODAL_CONTENT_WINDOW);
(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.

3
embedding/browser/webBrowser/nsIWebBrowserChrome.idl
View File

@ -77,9 +77,6 @@ interface nsIWebBrowserChrome : nsISupports
const unsigned long CHROME_NON_PRIVATE_WINDOW = 0x00020000;
const unsigned long CHROME_PRIVATE_LIFETIME = 0x00040000;
// Whether this was opened by nsGlobalWindow::ShowModalDialog.
const unsigned long CHROME_MODAL_CONTENT_WINDOW = 0x00080000;
// Prevents new window animations on Mac OS X Lion. Ignored on other
// platforms.
const unsigned long CHROME_MAC_SUPPRESS_ANIMATION = 0x01000000;

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

@ -504,12 +504,6 @@ nsWindowWatcher::OpenWindowInternal(nsIDOMWindow *aParent,
WinHasOption(features.get(), "-moz-internal-modal", 0, nullptr)) {
windowIsModalContentDialog = true;
// CHROME_MODAL gets inherited by dependent windows, which affects various
// platform-specific window state (especially on OSX). So we need some way
// to determine that this window was actually opened by nsGlobalWindow::
// ShowModalDialog(), and that somebody is actually going to be watching
// for return values and all that.
chromeFlags |= nsIWebBrowserChrome::CHROME_MODAL_CONTENT_WINDOW;
chromeFlags |= nsIWebBrowserChrome::CHROME_MODAL;
}