corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deCOMtaminate nsPIDOMWindow (bug 242111). r+sr=jst.

Browse Source
This commit is contained in:
bryner@brianryner.com
2004-05-03 21:48:36 +00:00
parent 613dd6e472
commit d509d3c6ba
58 changed files with 271 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
content/base/src/nsFrameLoader.cpp
View File

@@ -358,8 +358,7 @@ nsFrameLoader::Destroy()
}
// Let our window know that we are gone
nsCOMPtr<nsIDOMWindow> win(do_GetInterface(mDocShell));
nsCOMPtr<nsPIDOMWindow> win_private(do_QueryInterface(win));
nsCOMPtr<nsPIDOMWindow> win_private(do_GetInterface(mDocShell));
if (win_private) {
win_private->SetFrameElementInternal(nsnull);
}
@@ -562,8 +561,7 @@ nsFrameLoader::EnsureDocShell()
nsCOMPtr<nsIDOMElement> frame_element(do_QueryInterface(mOwnerContent));
NS_ASSERTION(frame_element, "frame loader owner element not a DOM element!");
nsCOMPtr<nsIDOMWindow> win(do_GetInterface(mDocShell));
nsCOMPtr<nsPIDOMWindow> win_private(do_QueryInterface(win));
nsCOMPtr<nsPIDOMWindow> win_private(do_GetInterface(mDocShell));
NS_ENSURE_TRUE(win_private, NS_ERROR_UNEXPECTED);
win_private->SetFrameElementInternal(frame_element);