Backed out changeset d76b42f0d6ca (bug 1523636) for causing bug 1543015. a=backout

2019-04-10 18:46:01 +03:00
parent 3f3675a689
commit 7e5b45129e
10 changed files with 221 additions and 241 deletions
--- a/dom/html/nsGenericHTMLFrameElement.cpp
+++ b/dom/html/nsGenericHTMLFrameElement.cpp
@@ -133,7 +133,9 @@ 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, mOpenerWindow, mNetworkCreated);
+  mFrameLoader = nsFrameLoader::Create(
+      this, mOpenerWindow ? mOpenerWindow->GetDOMWindow() : nullptr,
+      mNetworkCreated);
 }

 nsresult nsGenericHTMLFrameElement::CreateRemoteFrameLoader(