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

Fixing bug 318461. Move SetNewDocument() and SetOpenerWindow() from nsIScriptGlobalObject to nsPIDOMWindow to clean out non-script related methods form the nsIScriptGlobalObject interface. r=mrbkap@gmail.com, sr=bzbarsky@mit.edu

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@185536 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%mozilla.jstenback.com
2005-12-01 19:35:27 +00:00
parent f62cbe0aba
commit b3caccffbd
11 changed files with 97 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/content/html/document/src/nsHTMLDocument.cpp
View File

@@ -1932,16 +1932,18 @@ nsHTMLDocument::OpenCommon(const nsACString& aContentType, PRBool aReplace)
return rv;
}
// Before we reset the doc notify the globalwindow of the change.
// Before we reset the doc notify the globalwindow of the change,
// but only if we still have a window (i.e. our window object the
// current inner window in our outer window).
if (mScriptGlobalObject) {
nsPIDOMWindow *window = GetInnerWindow();
if (window) {
// Hold onto ourselves on the offchance that we're down to one ref
nsCOMPtr<nsIDOMDocument> kungFuDeathGrip =
do_QueryInterface((nsIHTMLDocument*)this);
rv = mScriptGlobalObject->SetNewDocument((nsDocument *)this, nsnull,
PR_FALSE);
rv = window->SetNewDocument(this, nsnull, PR_FALSE);
if (NS_FAILED(rv)) {
return rv;