Bug 1239463 - Do not assert when notifying an inactive document about changed content from the plugin crash notification. r=bz

This commit is contained in:
Josh Matthews 2016-01-21 13:39:13 -05:00
Родитель 7e97e2672b
Коммит 77fbe887eb
1 изменённых файлов: 2 добавлений и 1 удалений

Просмотреть файл

@ -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);
}