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

Bug 1353867 - Change WindowProxyHolder's native type to BrowsingContext. r=bzbarsky

Browse Source 
Make the WindowProxyHolder hold a strong reference to a BrowsingContext, as in the future
we might not have a nsPIDOMWindowOuter (if the document is loaded in a different process).

Differential Revision: https://phabricator.services.mozilla.com/D12651
This commit is contained in:
Peter Van der Beken
2019-01-02 13:27:05 +00:00
parent 0792b09f79
commit 955ad9221e
43 changed files with 276 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dom/html/nsGenericHTMLFrameElement.cpp
View File

@@ -71,12 +71,12 @@ nsGenericHTMLFrameElement::~nsGenericHTMLFrameElement() {
nsIDocument* nsGenericHTMLFrameElement::GetContentDocument(
nsIPrincipal& aSubjectPrincipal) {
nsCOMPtr<nsPIDOMWindowOuter> win = GetContentWindowInternal();
if (!win) {
RefPtr<BrowsingContext> bc = GetContentWindowInternal();
if (!bc) {
return nullptr;
}
nsIDocument* doc = win->GetDoc();
nsIDocument* doc = bc->GetDOMWindow()->GetDoc();
if (!doc) {
return nullptr;
}
@@ -88,8 +88,7 @@ nsIDocument* nsGenericHTMLFrameElement::GetContentDocument(
return doc;
}
already_AddRefed<nsPIDOMWindowOuter>
nsGenericHTMLFrameElement::GetContentWindowInternal() {
BrowsingContext* nsGenericHTMLFrameElement::GetContentWindowInternal() {
EnsureFrameLoader();
if (!mFrameLoader) {
@@ -101,21 +100,20 @@ nsGenericHTMLFrameElement::GetContentWindowInternal() {
return nullptr;
}
nsCOMPtr<nsIDocShell> doc_shell = mFrameLoader->GetDocShell(IgnoreErrors());
RefPtr<nsDocShell> doc_shell = mFrameLoader->GetDocShell(IgnoreErrors());
if (!doc_shell) {
return nullptr;
}
nsCOMPtr<nsPIDOMWindowOuter> win = doc_shell->GetWindow();
return win.forget();
return doc_shell->GetBrowsingContext();
}
Nullable<WindowProxyHolder> nsGenericHTMLFrameElement::GetContentWindow() {
nsCOMPtr<nsPIDOMWindowOuter> win = GetContentWindowInternal();
if (!win) {
RefPtr<BrowsingContext> bc = GetContentWindowInternal();
if (!bc) {
return nullptr;
}
return WindowProxyHolder(win.forget());
return WindowProxyHolder(bc);
}
void nsGenericHTMLFrameElement::EnsureFrameLoader() {
@@ -127,7 +125,8 @@ void nsGenericHTMLFrameElement::EnsureFrameLoader() {
// Strangely enough, this method doesn't actually ensure that the
// frameloader exists. It's more of a best-effort kind of thing.
mFrameLoader = nsFrameLoader::Create(
this, nsPIDOMWindowOuter::From(mOpenerWindow), mNetworkCreated);
this, mOpenerWindow ? mOpenerWindow->GetDOMWindow() : nullptr,
mNetworkCreated);
}
nsresult nsGenericHTMLFrameElement::CreateRemoteFrameLoader(