Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 979782: Fixup FindFrameForContentSibling to don't duplicate work and trigger assertions for display: contents. r=mats

Browse Source 
MozReview-Commit-ID: HAZh0RYY76x

--HG--
extra : rebase_source : 54a4be6aef7db2c32a560eb66e2ebf18cd16a377
This commit is contained in:
Emilio Cobos Álvarez 2017-11-01 16:40:09 +01:00
parent eaf4856688
commit 50a5c229d6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
layout/base/nsCSSFrameConstructor.cpp
View File

@ -6888,6 +6888,12 @@ nsCSSFrameConstructor::FindFrameForContentSibling(nsIContent* aContent,
sibling = aPrevSibling ?
FindPreviousSibling(iter, aTargetContent, aTargetContentDisplay, aParentFrame) :
FindNextSibling(iter, aTargetContent, aTargetContentDisplay, aParentFrame);
// The recursion above has already done all the placeholder and
// continuation fixups.
if (sibling) {
return sibling;
}
}
if (!sibling) {
// ... then ::after / ::before on the opposite end.
@ -6911,7 +6917,7 @@ nsCSSFrameConstructor::FindFrameForContentSibling(nsIContent* aContent,
sibling = placeholderFrame;
}
// The frame we have now should never be a continuation
// The frame we have now should never be a continuation.
NS_ASSERTION(!sibling->GetPrevContinuation(), "How did that happen?");
if (aPrevSibling) {