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

Followup for bug 613800, address review comments. r=jst, a=blocks-final

Browse Source
This commit is contained in:
Dave Townsend 2011-02-16 10:27:25 -08:00
parent 6f5dee4313
commit b76d26b457
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dom/base/nsGlobalWindow.cpp
View File

@ -2491,6 +2491,21 @@ nsGlobalWindow::UpdateParentTarget()
}
}
PRBool
nsGlobalWindow::GetIsTabModalPromptAllowed()
{
PRBool allowTabModal = PR_TRUE;
if (mDocShell) {
nsCOMPtr<nsIContentViewer> cv;
mDocShell->GetContentViewer(getter_AddRefs(cv));
nsCOMPtr<nsIContentViewer_MOZILLA_2_0_BRANCH> cv2 = do_QueryInterface(cv);
if (cv2)
cv2->GetIsTabModalPromptAllowed(&allowTabModal);
}
return allowTabModal;
}
nsresult
nsGlobalWindow::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
{
@ -4633,14 +4648,7 @@ nsGlobalWindow::Alert(const nsAString& aString)
// Check if we're being called at a point where we can't use tab-modal
// prompts, because something doesn't want reentrancy.
PRBool allowTabModal = PR_TRUE;
if (mDocShell) {
nsCOMPtr<nsIContentViewer> cv;
mDocShell->GetContentViewer(getter_AddRefs(cv));
nsCOMPtr<nsIContentViewer_MOZILLA_2_0_BRANCH> cv2 = do_QueryInterface(cv);
if (cv2)
cv2->GetIsTabModalPromptAllowed(&allowTabModal);
}
PRBool allowTabModal = GetIsTabModalPromptAllowed();
nsresult rv;
nsCOMPtr<nsIPromptFactory> promptFac =
@ -4706,14 +4714,7 @@ nsGlobalWindow::Confirm(const nsAString& aString, PRBool* aReturn)
// Check if we're being called at a point where we can't use tab-modal
// prompts, because something doesn't want reentrancy.
PRBool allowTabModal = PR_TRUE;
if (mDocShell) {
nsCOMPtr<nsIContentViewer> cv;
mDocShell->GetContentViewer(getter_AddRefs(cv));
nsCOMPtr<nsIContentViewer_MOZILLA_2_0_BRANCH> cv2 = do_QueryInterface(cv);
if (cv2)
cv2->GetIsTabModalPromptAllowed(&allowTabModal);
}
PRBool allowTabModal = GetIsTabModalPromptAllowed();
nsresult rv;
nsCOMPtr<nsIPromptFactory> promptFac =
@ -4782,14 +4783,7 @@ nsGlobalWindow::Prompt(const nsAString& aMessage, const nsAString& aInitial,
// Check if we're being called at a point where we can't use tab-modal
// prompts, because something doesn't want reentrancy.
PRBool allowTabModal = PR_TRUE;
if (mDocShell) {
nsCOMPtr<nsIContentViewer> cv;
mDocShell->GetContentViewer(getter_AddRefs(cv));
nsCOMPtr<nsIContentViewer_MOZILLA_2_0_BRANCH> cv2 = do_QueryInterface(cv);
if (cv2)
cv2->GetIsTabModalPromptAllowed(&allowTabModal);
}
PRBool allowTabModal = GetIsTabModalPromptAllowed();
nsresult rv;
nsCOMPtr<nsIPromptFactory> promptFac =

2
dom/base/nsGlobalWindow.h
View File

@ -820,6 +820,8 @@ protected:
virtual void UpdateParentTarget();
PRBool GetIsTabModalPromptAllowed();
// When adding new member variables, be careful not to create cycles
// through JavaScript. If there is any chance that a member variable
// could own objects that are implemented in JavaScript, then those