Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Treat terminal newlines in preformatted text like we treat <br> when inserting

Browse Source 
frames into a block.  Bug 310087, r+sr=roc


git-svn-id: svn://10.0.0.236/trunk@194984 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2006-04-20 19:00:33 +00:00
parent 56d871fdd7
commit 9241b52e99
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/layout/generic/nsBlockFrame.cpp
View File

@@ -5422,9 +5422,16 @@ nsBlockFrame::AddFrames(nsIFrame* aFrameList,
PRBool isBlock = nsLineLayout::TreatFrameAsBlock(newFrame);
// If the frame is a block frame, or if there is no previous line or if the
// previous line is a block line or ended with a <br> then make a new line.
// previous line is a block line we need to make a new line. We also make
// a new line, as an optimization, in the two cases we know we'll need it:
// if the previous line ended with a <br> or has significant whitespace and
// ended in a newline.
if (isBlock || prevSibLine == end_lines() || prevSibLine->IsBlock() ||
(aPrevSibling && aPrevSibling->GetType() == nsLayoutAtoms::brFrame)) {
(aPrevSibling &&
(aPrevSibling->GetType() == nsLayoutAtoms::brFrame ||
(aPrevSibling->GetType() == nsLayoutAtoms::textFrame &&
aPrevSibling->GetStyleText()->WhiteSpaceIsSignificant() &&
aPrevSibling->HasTerminalNewline())))) {
// Create a new line for the frame and add its line to the line
// list.
nsLineBox* line = NS_NewLineBox(presShell, newFrame, 1, isBlock);