Commit 35ea701f authored by Kyle Machulis's avatar Kyle Machulis
Browse files

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
parent 19cab049
......@@ -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);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment