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

Make mComputedWidth private, with a getter/setter, and make the setter update

Browse Source 
the resize flags.  Bug 367442, r+sr=dbaron


git-svn-id: svn://10.0.0.236/trunk@218933 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2007-01-26 00:05:12 +00:00
parent 0596f16735
commit 343ced44ba
32 changed files with 124 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/layout/forms/nsFieldSetFrame.cpp
View File

@@ -445,7 +445,7 @@ nsFieldSetFrame::Reflow(nsPresContext* aPresContext,
DO_GLOBAL_REFLOW_COUNT("nsFieldSetFrame");
DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus);
NS_PRECONDITION(aReflowState.mComputedWidth != NS_INTRINSICSIZE,
NS_PRECONDITION(aReflowState.ComputedWidth() != NS_INTRINSICSIZE,
"Should have a precomputed width!");
// Initialize OUT parameter
@@ -468,7 +468,7 @@ nsFieldSetFrame::Reflow(nsPresContext* aPresContext,
(NS_FRAME_IS_DIRTY | NS_FRAME_HAS_DIRTY_CHILDREN)) != 0;
}
nsSize availSize(aReflowState.mComputedWidth, aReflowState.availableHeight);
nsSize availSize(aReflowState.ComputedWidth(), aReflowState.availableHeight);
NS_ASSERTION(!mContentFrame ||
GetContentMinWidth(aReflowState.rendContext) <= availSize.width,
"Bogus availSize.width; should be bigger");
@@ -495,8 +495,8 @@ nsFieldSetFrame::Reflow(nsPresContext* aPresContext,
legendAvailSize);
// always give the legend as much size as it wants
legendReflowState.mComputedWidth =
mLegendFrame->GetPrefWidth(aReflowState.rendContext);
legendReflowState.
SetComputedWidth(mLegendFrame->GetPrefWidth(aReflowState.rendContext));
legendReflowState.mComputedHeight = NS_INTRINSICSIZE;
nsHTMLReflowMetrics legendDesiredSize;
@@ -583,8 +583,8 @@ nsFieldSetFrame::Reflow(nsPresContext* aPresContext,
}
// use the computed width if the inner content does not fill it
if (aReflowState.mComputedWidth > contentRect.width) {
contentRect.width = aReflowState.mComputedWidth;
if (aReflowState.ComputedWidth() > contentRect.width) {
contentRect.width = aReflowState.ComputedWidth();
}
if (mLegendFrame) {