Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 326877, close popups when navigating pages, r+sr=bz

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@218908 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
enndeakin%sympatico.ca
2007-01-25 17:59:20 +00:00
parent 4a6911fcbf
commit fd6335c608
4 changed files with 116 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
mozilla/layout/base/nsDocumentViewer.cpp
View File

@@ -120,6 +120,7 @@
#include "nsPIDOMWindow.h"
#include "nsJSEnvironment.h"
#include "nsIFocusController.h"
#include "nsIMenuParent.h"
#include "nsIScrollableView.h"
#include "nsIHTMLDocument.h"
@@ -370,6 +371,8 @@ private:
nsresult GetPopupLinkNode(nsIDOMNode** aNode);
nsresult GetPopupImageNode(nsIImageLoadingContent** aNode);
void HideViewIfPopup(nsIView* aView);
void DumpContentToPPM(const char* aFileName);
void PrepareToStartLoad(void);
@@ -1247,36 +1250,69 @@ DocumentViewerImpl::PageHide(PRBool aIsUnload)
}
mDocument->OnPageHide(!aIsUnload);
if (!aIsUnload)
return NS_OK;
if (aIsUnload) {
// if Destroy() was called during OnPageHide(), mDocument is nsnull.
NS_ENSURE_STATE(mDocument);
// if Destroy() was called during OnPageHide(), mDocument is nsnull.
NS_ENSURE_STATE(mDocument);
// First, get the window from the document...
nsPIDOMWindow *window = mDocument->GetWindow();
// First, get the window from the document...
nsPIDOMWindow *window = mDocument->GetWindow();
if (!window) {
// Fail if no window is available...
NS_ERROR("window not set for document!");
return NS_ERROR_NULL_POINTER;
}
if (!window) {
// Fail if no window is available...
NS_ERROR("window not set for document!");
return NS_ERROR_NULL_POINTER;
// Now, fire an Unload event to the document...
nsEventStatus status = nsEventStatus_eIgnore;
nsEvent event(PR_TRUE, NS_PAGE_UNLOAD);
event.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
// XXX Dispatching to |window|, but using |document| as the target.
event.target = mDocument;
// Never permit popups from the unload handler, no matter how we get
// here.
nsAutoPopupStatePusher popupStatePusher(openAbused, PR_TRUE);
nsEventDispatcher::Dispatch(window, mPresContext, &event, nsnull, &status);
}
// Now, fire an Unload event to the document...
nsEventStatus status = nsEventStatus_eIgnore;
nsEvent event(PR_TRUE, NS_PAGE_UNLOAD);
event.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
// XXX Dispatching to |window|, but using |document| as the target.
event.target = mDocument;
if (mPresShell) {
// look for open menupopups and close them after the unload event, in case
// the unload event listeners open any new popups
nsIViewManager *vm = mPresShell->GetViewManager();
if (vm) {
nsIView *rootView = nsnull;
vm->GetRootView(rootView);
if (rootView)
HideViewIfPopup(rootView);
}
}
// Never permit popups from the unload handler, no matter how we get
// here.
nsAutoPopupStatePusher popupStatePusher(openAbused, PR_TRUE);
nsEventDispatcher::Dispatch(window, mPresContext, &event, nsnull, &status);
return NS_OK;
}
void
DocumentViewerImpl::HideViewIfPopup(nsIView* aView)
{
nsIFrame* frame = NS_STATIC_CAST(nsIFrame*, aView->GetClientData());
if (frame) {
nsIMenuParent* parent;
CallQueryInterface(frame, &parent);
if (parent) {
parent->HideChain();
// really make sure the view is hidden
mViewManager->SetViewVisibility(aView, nsViewVisibility_kHide);
}
}
nsIView* child = aView->GetFirstChild();
while (child) {
HideViewIfPopup(child);
child = child->GetNextSibling();
}
}
static void
AttachContainerRecurse(nsIDocShell* aShell)
{