From 35ea701f351e0f64a3147604f7be50e7fec76696 Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Wed, 8 May 2019 14:32:55 -0700
Subject: [PATCH] Bug 1540839 - Don't set embedder element to null; r=nika

When resetting the BrowsingContext embedder element, only do so if the
FrameElement we're setting isn't already null.

Differential Revision: https://phabricator.services.mozilla.com/D30562
---
 dom/ipc/BrowserParent.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/ipc/BrowserParent.cpp b/dom/ipc/BrowserParent.cpp
index 92e5cb37b239..3df0d4fde821 100644
--- a/dom/ipc/BrowserParent.cpp
+++ b/dom/ipc/BrowserParent.cpp
@@ -536,7 +536,7 @@ void BrowserParent::SetOwnerElement(Element* aElement) {
 
   // Set our BrowsingContext's embedder if we're not embedded within a
   // BrowserBridgeParent.
-  if (!GetBrowserBridgeParent() && mBrowsingContext) {
+  if (!GetBrowserBridgeParent() && mBrowsingContext && mFrameElement) {
     mBrowsingContext->SetEmbedderElement(mFrameElement);
   }