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

Fixing bug 303765. Don't ever reuse a listener manager on a new inner window. r=sfraser_bugs@smfr.org, sr=brendan@mozilla.org

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@178308 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%mozilla.jstenback.com 2005-08-19 22:56:20 +00:00
parent 49726a940a
commit 3f4aec8db1
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/dom/src/base/nsGlobalWindow.cpp
View File

@ -894,10 +894,6 @@ nsGlobalWindow::SetNewDocument(nsIDOMDocument* aDocument,
nsGlobalWindow *currentInner = GetCurrentInnerWindowInternal();
// In case we're not removing event listeners, move the event
// listener manager over to the new inner window.
nsCOMPtr<nsIEventListenerManager> listenerManager;
if (currentInner && !currentInner->IsFrozen()) {
if (!reUseInnerWindow) {
currentInner->ClearAllTimeouts();
@ -917,8 +913,6 @@ nsGlobalWindow::SetNewDocument(nsIDOMDocument* aDocument,
if (aRemoveEventListeners && currentInner->mListenerManager) {
currentInner->mListenerManager->RemoveAllListeners(PR_FALSE);
currentInner->mListenerManager = nsnull;
} else {
listenerManager = currentInner->mListenerManager;
}
nsWindowSH::InvalidateGlobalScopePolluter(cx, currentInner->mJSObject);
@ -1069,8 +1063,6 @@ nsGlobalWindow::SetNewDocument(nsIDOMDocument* aDocument,
html_doc);
}
newInnerWindow->mListenerManager = listenerManager;
// InitClassesWithNewWrappedGlobal() for the new inner window sets
// the global object in cx to be the new wrapped global. We don't
// want that, but re-initializing the outer window will fix that