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

Replace computation of max-element-size (height and width) with max-element-width alone, since the max-element-height is practically unused and not meaningful for layout. b=186953 r+sr=bzbarsky

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@136064 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org
2003-01-09 14:26:32 +00:00
parent 1c7f8e98ea
commit a569c670f5
115 changed files with 1120 additions and 1524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/layout/html/base/src/nsTextFrame.cpp
View File

@@ -5399,9 +5399,8 @@ nsTextFrame::Reflow(nsIPresContext* aPresContext,
aMetrics.height = 0;
aMetrics.ascent = 0;
aMetrics.descent = 0;
if (nsnull != aMetrics.maxElementSize) {
aMetrics.maxElementSize->width = 0;
aMetrics.maxElementSize->height = 0;
if (aMetrics.mComputeMEW) {
aMetrics.mMaxElementWidth = 0;
}
#ifdef MOZ_MATHML
if (NS_REFLOW_CALC_BOUNDING_METRICS & aMetrics.mFlags)
@@ -5532,7 +5531,7 @@ nsTextFrame::Reflow(nsIPresContext* aPresContext,
}
if (!mNextInFlow &&
(mState & TEXT_OPTIMIZE_RESIZE) &&
!aMetrics.maxElementSize &&
!aMetrics.mComputeMEW &&
(lastTimeWeSkippedLeadingWS == skipWhitespace) &&
((wrapping && (maxWidth >= realWidth)) ||
(!wrapping && (prevColumn == column))) &&
@@ -5557,7 +5556,7 @@ nsTextFrame::Reflow(nsIPresContext* aPresContext,
// Local state passed to the routines that do the actual text measurement
TextReflowData textData(startingOffset, wrapping, skipWhitespace,
measureText, inWord, lineLayout.GetFirstLetterStyleOK(),
lineLayout.LineIsBreakable(), nsnull != aMetrics.maxElementSize,
lineLayout.LineIsBreakable(), aMetrics.mComputeMEW,
PR_FALSE);
// Measure the text
@@ -5595,9 +5594,8 @@ nsTextFrame::Reflow(nsIPresContext* aPresContext,
if (!wrapping) {
textData.mMaxWordWidth = textData.mX;
}
if (nsnull != aMetrics.maxElementSize) {
aMetrics.maxElementSize->width = textData.mMaxWordWidth;
aMetrics.maxElementSize->height = aMetrics.height;
if (aMetrics.mComputeMEW) {
aMetrics.mMaxElementWidth = textData.mMaxWordWidth;
}
// Set content offset and length