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

Bug 1144096 part 22 - [css-grid] Check NS_INLINE_IS_BREAK_BEFORE before checking other completion status. r=dholbert

Browse Source
This commit is contained in:
Mats Palmgren 2016-03-11 17:39:27 +01:00
parent 49b7f696e3
commit c46f94cf01
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layout/generic/nsContainerFrame.cpp
View File

@ -1030,7 +1030,8 @@ nsContainerFrame::ReflowChild(nsIFrame* aKidFrame,
// If the child frame is complete, delete any next-in-flows,
// but only if the NO_DELETE_NEXT_IN_FLOW flag isn't set.
if (NS_FRAME_IS_FULLY_COMPLETE(aStatus) &&
if (!NS_INLINE_IS_BREAK_BEFORE(aStatus) &&
NS_FRAME_IS_FULLY_COMPLETE(aStatus) &&
!(aFlags & NS_FRAME_NO_DELETE_NEXT_IN_FLOW_CHILD)) {
nsIFrame* kidNextInFlow = aKidFrame->GetNextInFlow();
if (kidNextInFlow) {

3
layout/generic/nsGridContainerFrame.cpp
View File

@ -4528,7 +4528,8 @@ nsGridContainerFrame::ReflowRowsInFragmentainer(
nsReflowStatus childStatus;
ReflowInFlowChild(child, info, aContainerSize, &aFragmentainer,
aState, aContentArea, aDesiredSize, childStatus);
MOZ_ASSERT(!NS_FRAME_IS_FULLY_COMPLETE(childStatus) ||
MOZ_ASSERT(NS_INLINE_IS_BREAK_BEFORE(childStatus) ||
!NS_FRAME_IS_FULLY_COMPLETE(childStatus) ||
!child->GetNextInFlow(),
"fully-complete reflow should destroy any NIFs");