зеркало из https://github.com/mozilla/pjs.git
Bug 262403. Don't do a line break just because a float was broken across pages. Also, squash some assertions while printing. r+sr=dbaron
This commit is contained in:
Родитель
73ba0aeb98
Коммит
2182005118
|
@ -337,9 +337,10 @@ nsLayoutUtils::FindSiblingViewFor(nsIView* aParentView, nsIFrame* aFrame) {
|
|||
}
|
||||
NS_ASSERTION(f, "Can't find a frame anywhere!");
|
||||
}
|
||||
if (f && CompareTreePosition(aFrame->GetContent(),
|
||||
f->GetContent(), parentViewContent) > 0) {
|
||||
// aFrame's content is after f's content, so put our view before f's view
|
||||
if (!f || !aFrame->GetContent() || !f->GetContent() ||
|
||||
CompareTreePosition(aFrame->GetContent(), f->GetContent(), parentViewContent) > 0) {
|
||||
// aFrame's content is after f's content (or we just don't know),
|
||||
// so put our view before f's view
|
||||
return insertBefore;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -773,6 +773,8 @@ nsInlineFrame::ReflowInlineFrame(nsPresContext* aPresContext,
|
|||
if (nsLayoutAtoms::placeholderFrame == aFrame->GetType()) {
|
||||
nsBlockReflowState* blockRS = lineLayout->mBlockRS;
|
||||
blockRS->mBlock->SplitPlaceholder(*blockRS, aFrame);
|
||||
// Allow the parent to continue reflowing
|
||||
aStatus = NS_FRAME_COMPLETE;
|
||||
}
|
||||
else {
|
||||
nsIFrame* newFrame;
|
||||
|
|
Загрузка…
Ссылка в новой задаче