Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 608191 - Fix dochsell assertion caused by not forwarding relevant nsGlobalWindow functions, r=bzbarsky a=jst

Browse Source
This commit is contained in:
Nochum Sossonko 2011-02-11 11:43:26 -05:00
parent 11ba778204
commit 892e439f45
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/base/nsGlobalWindow.cpp
View File

@ -4438,6 +4438,8 @@ nsGlobalWindow::Dump(const nsAString& aStr)
void
nsGlobalWindow::EnsureReflowFlushAndPaint()
{
NS_ASSERTION(IsOuterWindow(), "EnsureReflowFlushAndPaint() must be called on"
"the outer window");
NS_ASSERTION(mDocShell, "EnsureReflowFlushAndPaint() called with no "
"docshell!");
@ -4717,6 +4719,9 @@ NS_IMETHODIMP
nsGlobalWindow::Prompt(const nsAString& aMessage, const nsAString& aInitial,
nsAString& aReturn)
{
FORWARD_TO_OUTER(Prompt, (aMessage, aInitial, aReturn),
NS_ERROR_NOT_INITIALIZED);
SetDOMStringToNull(aReturn);
if (AreDialogsBlocked())
@ -6755,6 +6760,9 @@ nsGlobalWindow::ShowModalDialog(const nsAString& aURI, nsIVariant *aArgs,
const nsAString& aOptions,
nsIVariant **aRetVal)
{
FORWARD_TO_OUTER(ShowModalDialog, (aURI, aArgs, aOptions, aRetVal),
NS_ERROR_NOT_INITIALIZED);
*aRetVal = nsnull;
// Before bringing up the window/dialog, unsuppress painting and flush