Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
roytam1 2021-07-16 09:22:11 +08:00
commit b34627c802

View file

@ -3464,8 +3464,7 @@ nsCSSFrameConstructor::ConstructTextFrame(const FrameConstructionData* aData,
aFrameItems.AddChild(newFrame); aFrameItems.AddChild(newFrame);
if (!aState.mCreatingExtraFrames || if (!aState.mCreatingExtraFrames ||
(aContent->IsInNativeAnonymousSubtree() && (aContent->IsInNativeAnonymousSubtree() && !aContent->GetPrimaryFrame())) {
!aContent->GetPrimaryFrame())) {
aContent->SetPrimaryFrame(newFrame); aContent->SetPrimaryFrame(newFrame);
} }
} }