Bug 1340966 Part 2 - Fix assertion in nsBlockFrame::DoReflowInlineFrames().
SetNextInFlowNeedsReflow() will also assert on this call site after adding
Part 3. These lines removed here were added in
bug 523468, but the test
case (523468-1.html) added in
bug 523468 is no longer assert after applying
this patch, so these lines do not seem relevant anymore.
MozReview-Commit-ID: DVlR2GPYb9S
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -4163,19 +4163,16 @@ nsBlockFrame::DoReflowInlineFrames(Block
if (pushedToOverflowLines) {
// aLine is stale, it's associated with the main line list but it should
// be associated with the overflow line list now
aLine = overflowLines->mLines.begin();
}
nsBlockInFlowLineIterator iter(this, aLine, pushedToOverflowLines);
if (iter.Next() && iter.GetLine()->IsInline()) {
iter.GetLine()->MarkDirty();
- if (iter.GetContainer() != this) {
- aState.mReflowStatus.SetNextInFlowNeedsReflow();
- }
}
}
*aLineReflowStatus = lineReflowStatus;
}
/**
* Reflow an inline frame. The reflow status is mapped from the frames