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

Bug 1241764: Replace nsPIDOMWindow with nsPIDOMWindowInner/Outer. r=mrbkap,smaug

Browse Source
This commit is contained in:
Kyle Huey
2016-01-30 09:05:36 -08:00
parent 366da70c9f
commit e95edb30a9
806 changed files with 4709 additions and 5300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dom/html/nsGenericHTMLFrameElement.cpp
View File

@@ -85,7 +85,7 @@ nsGenericHTMLFrameElement::GetContentDocument(nsIDOMDocument** aContentDocument)
nsIDocument*
nsGenericHTMLFrameElement::GetContentDocument()
{
nsCOMPtr<nsPIDOMWindow> win = GetContentWindow();
nsCOMPtr<nsPIDOMWindowOuter> win = GetContentWindow();
if (!win) {
return nullptr;
}
@@ -103,16 +103,7 @@ nsGenericHTMLFrameElement::GetContentDocument()
return doc;
}
nsresult
nsGenericHTMLFrameElement::GetContentWindow(nsIDOMWindow** aContentWindow)
{
NS_PRECONDITION(aContentWindow, "Null out param");
nsCOMPtr<nsPIDOMWindow> window = GetContentWindow();
window.forget(aContentWindow);
return NS_OK;
}
already_AddRefed<nsPIDOMWindow>
already_AddRefed<nsPIDOMWindowOuter>
nsGenericHTMLFrameElement::GetContentWindow()
{
EnsureFrameLoader();
@@ -131,7 +122,7 @@ nsGenericHTMLFrameElement::GetContentWindow()
nsCOMPtr<nsIDocShell> doc_shell;
mFrameLoader->GetDocShell(getter_AddRefs(doc_shell));
nsCOMPtr<nsPIDOMWindow> win = do_GetInterface(doc_shell);
nsCOMPtr<nsPIDOMWindowOuter> win = do_GetInterface(doc_shell);
if (!win) {
return nullptr;