Backed out changeset cffde1d0ebb4 (bug 1364361)

This commit is contained in:
Sebastian Hengst 2017-06-16 09:27:14 +02:00
Родитель 2647eaf65c
Коммит 43a1d3b898
1 изменённых файлов: 1 добавлений и 12 удалений

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

@ -370,18 +370,7 @@ AllChildrenIterator::Seek(nsIContent* aChildToFind)
void void
AllChildrenIterator::AppendNativeAnonymousChildren() AllChildrenIterator::AppendNativeAnonymousChildren()
{ {
if (nsIFrame* primaryFrame = mOriginalContent->GetPrimaryFrame()) { AppendNativeAnonymousChildrenFromFrame(mOriginalContent->GetPrimaryFrame());
// NAC created by the element's primary frame.
AppendNativeAnonymousChildrenFromFrame(primaryFrame);
// NAC created by any other non-primary frames for the element.
AutoTArray<nsIFrame::OwnedAnonBox,8> ownedAnonBoxes;
primaryFrame->AppendOwnedAnonBoxes(ownedAnonBoxes);
for (nsIFrame::OwnedAnonBox& box : ownedAnonBoxes) {
MOZ_ASSERT(box.mAnonBoxFrame->GetContent() == mOriginalContent);
AppendNativeAnonymousChildrenFromFrame(box.mAnonBoxFrame);
}
}
// The root scroll frame is not the primary frame of the root element. // The root scroll frame is not the primary frame of the root element.
// Detect and handle this case. // Detect and handle this case.