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

Bug 398181: Use NSCoordSaturatingAdd/Subtract in 3 places where we might have

Browse Source 
unconstrained heights.  r+sr+a=roc


git-svn-id: svn://10.0.0.236/trunk@239069 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dholbert%cs.stanford.edu 2007-11-09 17:16:36 +00:00
parent 5622977163
commit a64bae2eaf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/layout/generic/nsFrame.cpp
View File

@ -2866,12 +2866,12 @@ nsIFrame::InlinePrefWidthData::ForceBreak(nsIRenderingContext *aRenderingContext
if (floats_cur > floats_done)
floats_done = floats_cur;
currentLine += floats_done;
currentLine = NSCoordSaturatingAdd(currentLine, floats_done);
floats.Clear();
}
currentLine -= trailingWhitespace;
currentLine = NSCoordSaturatingSubtract(currentLine, trailingWhitespace, nscoord_MAX);
prevLines = PR_MAX(prevLines, currentLine);
currentLine = trailingWhitespace = 0;
}

2
mozilla/layout/generic/nsTextFrameThebes.cpp
View File

@ -4933,7 +4933,7 @@ nsTextFrame::AddInlinePrefWidthForFlow(nsIRenderingContext *aRenderingContext,
// onto one line, so just measure it
nscoord width =
NSToCoordCeil(mTextRun->GetAdvanceWidth(start, flowEndInTextRun - start, &provider));
aData->currentLine += width;
aData->currentLine = NSCoordSaturatingAdd(aData->currentLine, width);
PRUint32 trimStart = GetEndOfTrimmedText(provider.GetFragment(), start,
flowEndInTextRun, &iter);