Bug 1525720, part 3 - Remove method to createRemoteFrameLoader from nsIMozBrowserFrame interface. r=farre
This appears unused and adds unneeded surface area for these API's to support. Differential Revision: https://phabricator.services.mozilla.com/D31431
This commit is contained in:
@@ -132,12 +132,26 @@ void nsGenericHTMLFrameElement::EnsureFrameLoader() {
|
||||
mFrameLoader = nsFrameLoader::Create(this, mOpenerWindow, mNetworkCreated);
|
||||
}
|
||||
|
||||
nsresult nsGenericHTMLFrameElement::CreateRemoteFrameLoader(
|
||||
nsIRemoteTab* aBrowserParent) {
|
||||
void nsGenericHTMLFrameElement::DisallowCreateFrameLoader() {
|
||||
MOZ_ASSERT(!mFrameLoader);
|
||||
MOZ_ASSERT(!mFrameLoaderCreationDisallowed);
|
||||
mFrameLoaderCreationDisallowed = true;
|
||||
}
|
||||
|
||||
void nsGenericHTMLFrameElement::AllowCreateFrameLoader() {
|
||||
MOZ_ASSERT(!mFrameLoader);
|
||||
MOZ_ASSERT(mFrameLoaderCreationDisallowed);
|
||||
mFrameLoaderCreationDisallowed = false;
|
||||
}
|
||||
|
||||
void nsGenericHTMLFrameElement::CreateRemoteFrameLoader(
|
||||
BrowserParent* aBrowserParent) {
|
||||
MOZ_ASSERT(!mFrameLoader);
|
||||
EnsureFrameLoader();
|
||||
NS_ENSURE_STATE(mFrameLoader);
|
||||
mFrameLoader->SetRemoteBrowser(aBrowserParent);
|
||||
if (NS_WARN_IF(!mFrameLoader)) {
|
||||
return;
|
||||
}
|
||||
mFrameLoader->InitializeFromBrowserParent(aBrowserParent);
|
||||
|
||||
if (nsSubDocumentFrame* subdocFrame = do_QueryFrame(GetPrimaryFrame())) {
|
||||
// The reflow for this element already happened while we were waiting
|
||||
@@ -146,7 +160,6 @@ nsresult nsGenericHTMLFrameElement::CreateRemoteFrameLoader(
|
||||
// ReflowFinished, and we need to do it properly now.
|
||||
mFrameLoader->UpdatePositionAndSize(subdocFrame);
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
void nsGenericHTMLFrameElement::PresetOpenerWindow(
|
||||
@@ -442,22 +455,6 @@ NS_IMETHODIMP nsGenericHTMLFrameElement::GetIsolated(bool* aOut) {
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsGenericHTMLFrameElement::DisallowCreateFrameLoader() {
|
||||
MOZ_ASSERT(!mFrameLoader);
|
||||
MOZ_ASSERT(!mFrameLoaderCreationDisallowed);
|
||||
mFrameLoaderCreationDisallowed = true;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsGenericHTMLFrameElement::AllowCreateFrameLoader() {
|
||||
MOZ_ASSERT(!mFrameLoader);
|
||||
MOZ_ASSERT(mFrameLoaderCreationDisallowed);
|
||||
mFrameLoaderCreationDisallowed = false;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsGenericHTMLFrameElement::InitializeBrowserAPI() {
|
||||
MOZ_ASSERT(mFrameLoader);
|
||||
|
||||
Reference in New Issue
Block a user