Bug 1542787 - Support getting contentWindow on out-of-process frames, r=peterv

Differential Revision: https://phabricator.services.mozilla.com/D26556
2019-04-11 18:56:48 +00:00
parent 7919fc0ad9
commit 15f9d16b35
1 changed files with 2 additions and 6 deletions
--- a/dom/html/nsGenericHTMLFrameElement.cpp
+++ b/dom/html/nsGenericHTMLFrameElement.cpp
@@ -109,12 +109,8 @@ BrowsingContext* nsGenericHTMLFrameElement::GetContentWindowInternal() {
    return nullptr;
  }

-  RefPtr<nsDocShell> doc_shell = mFrameLoader->GetDocShell(IgnoreErrors());
-  if (!doc_shell) {
-    return nullptr;
-  }
-
-  return doc_shell->GetBrowsingContext();
+  RefPtr<BrowsingContext> bc = mFrameLoader->GetBrowsingContext();
+  return bc;
 }

 Nullable<WindowProxyHolder> nsGenericHTMLFrameElement::GetContentWindow() {