From 77fbe887ebad4bab8a9a4c12ec132a076f601cd1 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 21 Jan 2016 13:39:13 -0500 Subject: [PATCH] Bug 1239463 - Do not assert when notifying an inactive document about changed content from the plugin crash notification. r=bz --- dom/base/nsObjectLoadingContent.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dom/base/nsObjectLoadingContent.cpp b/dom/base/nsObjectLoadingContent.cpp index fa8eb49f65ab..ef8aad101a92 100644 --- a/dom/base/nsObjectLoadingContent.cpp +++ b/dom/base/nsObjectLoadingContent.cpp @@ -2719,8 +2719,8 @@ nsObjectLoadingContent::NotifyStateChanged(ObjectType aOldType, EventStates newState = ObjectState(); if (newState != aOldState) { + NS_ASSERTION(thisContent->IsInComposedDoc(), "Something is confused"); // This will trigger frame construction - NS_ASSERTION(InActiveDocument(thisContent), "Something is confused"); EventStates changedBits = aOldState ^ newState; { @@ -2728,6 +2728,7 @@ nsObjectLoadingContent::NotifyStateChanged(ObjectType aOldType, doc->ContentStateChanged(thisContent, changedBits); } if (aSync) { + NS_ASSERTION(InActiveDocument(thisContent), "Something is confused"); // Make sure that frames are actually constructed immediately. doc->FlushPendingNotifications(Flush_Frames); }