Bug 1279354 part 1 - Always call SetPrimaryFrame for NS_FRAME_ANONYMOUSCONTENTCREATOR_CONTENT frames (unless there is one already), including when mCreatingExtraFrames is true. r=dholbert

This commit is contained in:
Mats Palmgren 2016-11-28 23:00:20 +01:00
Родитель bc3832a204
Коммит 7c01c6afca
1 изменённых файлов: 2 добавлений и 1 удалений

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

@ -4084,7 +4084,8 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt
// the frame bit, because by this point mIsGeneratedContent has been cleared
// on aItem.
if ((!aState.mCreatingExtraFrames ||
((primaryFrame->GetStateBits() & NS_FRAME_GENERATED_CONTENT) &&
(primaryFrame->HasAnyStateBits(NS_FRAME_ANONYMOUSCONTENTCREATOR_CONTENT |
NS_FRAME_GENERATED_CONTENT) &&
!aItem.mContent->GetPrimaryFrame())) &&
!(bits & FCDATA_SKIP_FRAMESET)) {
aItem.mContent->SetPrimaryFrame(primaryFrame);