Backing out 406686 again

2008-02-06 18:19:12 -08:00
parent 720cbe227a
commit 9faadb69ab
7 changed files with 15 additions and 68 deletions
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -1179,7 +1179,9 @@ DocumentViewerImpl::PageHide(PRBool aIsUnload)
 #ifdef MOZ_XUL
  // look for open menupopups and close them after the unload event, in case
  // the unload event listeners open any new popups
-  nsContentUtils::HidePopupsInDocument(mDocument);
+  nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
+  if (pm && mDocument)
+    pm->HidePopupsInDocument(mDocument);
 #endif

  return NS_OK;