corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Checked in wrong patch. Backing out.

Browse Source
This commit is contained in:
roc+@cs.cmu.edu
2005-05-02 04:48:59 +00:00
parent 6326432a49
commit 0519bc8b09
3 changed files with 52 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
layout/generic/nsHTMLReflowState.cpp
View File

@@ -379,64 +379,6 @@ nsHTMLReflowState::GetContainingBlockContentWidth(const nsHTMLReflowState* aRefl
return rs->mComputedWidth;
}
nscoord
nsHTMLReflowState::AdjustIntrinsicMinContentWidthForStyle(nscoord aWidth) const
{
nsStyleUnit widthUnit = mStylePosition->mWidth.GetUnit();
if (eStyleUnit_Percent == widthUnit) {
aWidth = 0;
} else if (eStyleUnit_Coord == widthUnit) {
NS_ASSERTION(NS_UNCONSTRAINEDSIZE != mComputedWidth,
"Should be a computed width here");
aWidth = mComputedWidth;
}
nsStyleUnit maxWidthUnit = mStylePosition->mMaxWidth.GetUnit();
if (eStyleUnit_Percent == maxWidthUnit) {
aWidth = 0;
} else if (eStyleUnit_Coord == maxWidthUnit) {
NS_ASSERTION(NS_UNCONSTRAINEDSIZE != mComputedMaxWidth,
"Should be a computed max-width here");
aWidth = PR_MIN(aWidth, mComputedMaxWidth);
}
nsStyleUnit minWidthUnit = mStylePosition->mMinWidth.GetUnit();
if (eStyleUnit_Coord == minWidthUnit) {
NS_ASSERTION(NS_UNCONSTRAINEDSIZE != mComputedMinWidth,
"Should be a computed max-width here");
aWidth = PR_MAX(aWidth, mComputedMinWidth);
}
return aWidth;
}
nscoord
nsHTMLReflowState::AdjustIntrinsicContentWidthForStyle(nscoord aWidth) const
{
nsStyleUnit widthUnit = mStylePosition->mWidth.GetUnit();
if (eStyleUnit_Coord == widthUnit) {
NS_ASSERTION(NS_UNCONSTRAINEDSIZE != mComputedWidth,
"Should be a computed width here");
aWidth = mComputedWidth;
}
nsStyleUnit maxWidthUnit = mStylePosition->mMaxWidth.GetUnit();
if (eStyleUnit_Coord == maxWidthUnit) {
NS_ASSERTION(NS_UNCONSTRAINEDSIZE != mComputedMaxWidth,
"Should be a computed max-width here");
aWidth = PR_MIN(aWidth, mComputedMaxWidth);
}
nsStyleUnit minWidthUnit = mStylePosition->mMinWidth.GetUnit();
if (eStyleUnit_Coord == minWidthUnit) {
NS_ASSERTION(NS_UNCONSTRAINEDSIZE != mComputedMinWidth,
"Should be a computed max-width here");
aWidth = PR_MAX(aWidth, mComputedMinWidth);
}
return aWidth;
}
/* static */
nsIFrame*
nsHTMLReflowState::GetContainingBlockFor(const nsIFrame* aFrame)
@@ -1766,7 +1708,11 @@ nsHTMLReflowState::InitConstraints(nsPresContext* aPresContext,
mComputedPadding.left = aPadding->left;
}
else {
ComputePadding(aContainingBlockWidth, cbrs);
if (frame->GetType() == nsLayoutAtoms::scrollFrame) {
mComputedPadding.SizeTo(0, 0, 0, 0);
} else {
ComputePadding(aContainingBlockWidth, cbrs);
}
}
if (aBorder) { // border is an input arg
mComputedBorderPadding = *aBorder;