Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 306164: The global scope polluter is not reinstalled when document.write is used. r+sr=jst

Browse Source
This commit is contained in:
mrbkap%gmail.com 2005-08-29 22:04:39 +00:00
parent f3ce4771c5
commit 17f1097d7e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/src/base/nsGlobalWindow.cpp
View File

@ -947,7 +947,9 @@ nsGlobalWindow::SetNewDocument(nsIDOMDocument* aDocument,
currentInner->mListenerManager = nsnull;
}
nsWindowSH::InvalidateGlobalScopePolluter(cx, currentInner->mJSObject);
if (!reUseInnerWindow || newDoc != oldDoc) {
nsWindowSH::InvalidateGlobalScopePolluter(cx, currentInner->mJSObject);
}
}
nsRefPtr<nsGlobalWindow> newInnerWindow;
@ -1097,7 +1099,7 @@ nsGlobalWindow::SetNewDocument(nsIDOMDocument* aDocument,
mInnerWindow = newInnerWindow;
}
if (newDoc != oldDoc && !aState) {
if ((!reUseInnerWindow || newDoc != oldDoc) && !aState) {
nsCOMPtr<nsIHTMLDocument> html_doc(do_QueryInterface(mDocument));
nsWindowSH::InstallGlobalScopePolluter(cx, newInnerWindow->mJSObject,
html_doc);