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

Bug 1524683 - Move all nsIFrameLoaderOwner references to nsFrameLoaderOwner; r=nika

Browse Source 
Depends on D19728

Differential Revision: https://phabricator.services.mozilla.com/D19729
This commit is contained in:
Kyle Machulis
2019-02-15 22:20:53 +00:00
parent ca9614b1a0
commit 00cdaa3c74
33 changed files with 111 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dom/html/nsGenericHTMLFrameElement.cpp
View File

@@ -49,7 +49,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsGenericHTMLFrameElement,
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
NS_IMPL_ISUPPORTS_CYCLE_COLLECTION_INHERITED(
nsGenericHTMLFrameElement, nsGenericHTMLElement, nsIFrameLoaderOwner,
nsGenericHTMLFrameElement, nsGenericHTMLElement, nsFrameLoaderOwner,
nsIDOMMozBrowserFrame, nsIMozBrowserFrame, nsGenericHTMLFrameElement)
NS_IMETHODIMP
@@ -155,12 +155,6 @@ nsresult nsGenericHTMLFrameElement::CreateRemoteFrameLoader(
return NS_OK;
}
NS_IMETHODIMP_(already_AddRefed<nsFrameLoader>)
nsGenericHTMLFrameElement::GetFrameLoader() {
RefPtr<nsFrameLoader> loader = mFrameLoader;
return loader.forget();
}
void nsGenericHTMLFrameElement::PresetOpenerWindow(
const Nullable<WindowProxyHolder>& aOpenerWindow, ErrorResult& aRv) {
MOZ_ASSERT(!mFrameLoader);
@@ -168,11 +162,6 @@ void nsGenericHTMLFrameElement::PresetOpenerWindow(
aOpenerWindow.IsNull() ? nullptr : aOpenerWindow.Value().get();
}
void nsGenericHTMLFrameElement::InternalSetFrameLoader(
nsFrameLoader* aNewFrameLoader) {
mFrameLoader = aNewFrameLoader;
}
void nsGenericHTMLFrameElement::SwapFrameLoaders(
HTMLIFrameElement& aOtherLoaderOwner, ErrorResult& rv) {
if (&aOtherLoaderOwner == this) {
@@ -189,7 +178,7 @@ void nsGenericHTMLFrameElement::SwapFrameLoaders(
}
void nsGenericHTMLFrameElement::SwapFrameLoaders(
nsIFrameLoaderOwner* aOtherLoaderOwner, mozilla::ErrorResult& rv) {
nsFrameLoaderOwner* aOtherLoaderOwner, mozilla::ErrorResult& rv) {
RefPtr<nsFrameLoader> loader = GetFrameLoader();
RefPtr<nsFrameLoader> otherLoader = aOtherLoaderOwner->GetFrameLoader();
if (!loader || !otherLoader) {