wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove no-longer-needed code for handling unconstrained containing block widths. (Bug 585715) r=bzbarsky a2.0=blocking+

Browse Source
This commit is contained in:
L. David Baron 2010-08-31 12:05:12 -04:00
parent b3fa68a978
commit 8bd67bd46c
1 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
layout/generic/nsHTMLReflowState.cpp
View File

@ -611,17 +611,6 @@ nsHTMLReflowState::ComputeRelativeOffsets(const nsHTMLReflowState* cbrs,
PRBool leftIsAuto = eStyleUnit_Auto == mStylePosition->mOffset.GetLeftUnit();
PRBool rightIsAuto = eStyleUnit_Auto == mStylePosition->mOffset.GetRightUnit();
// Check for percentage based values and an unconstrained containing
// block width. Treat them like 'auto'
if (NS_UNCONSTRAINEDSIZE == aContainingBlockWidth) {
if (mStylePosition->OffsetHasPercent(NS_SIDE_LEFT)) {
leftIsAuto = PR_TRUE;
}
if (mStylePosition->OffsetHasPercent(NS_SIDE_RIGHT)) {
rightIsAuto = PR_TRUE;
}
}
// If neither 'left' not 'right' are auto, then we're over-constrained and
// we ignore one of them
if (!leftIsAuto && !rightIsAuto) {
@ -2163,25 +2152,12 @@ nsCSSOffsetState::ComputeMargin(nscoord aContainingBlockWidth)
const nsStyleMargin *styleMargin = frame->GetStyleMargin();
if (!styleMargin->GetMargin(mComputedMargin)) {
// We have to compute the value
if (NS_UNCONSTRAINEDSIZE == aContainingBlockWidth) {
mComputedMargin.left = 0;
mComputedMargin.right = 0;
if (eStyleUnit_Coord == styleMargin->mMargin.GetLeftUnit()) {
mComputedMargin.left = styleMargin->mMargin.GetLeft().GetCoordValue();
}
if (eStyleUnit_Coord == styleMargin->mMargin.GetRightUnit()) {
mComputedMargin.right = styleMargin->mMargin.GetRight().GetCoordValue();
}
} else {
mComputedMargin.left = nsLayoutUtils::
ComputeWidthDependentValue(aContainingBlockWidth,
styleMargin->mMargin.GetLeft());
mComputedMargin.right = nsLayoutUtils::
ComputeWidthDependentValue(aContainingBlockWidth,
styleMargin->mMargin.GetRight());
}
mComputedMargin.left = nsLayoutUtils::
ComputeWidthDependentValue(aContainingBlockWidth,
styleMargin->mMargin.GetLeft());
mComputedMargin.right = nsLayoutUtils::
ComputeWidthDependentValue(aContainingBlockWidth,
styleMargin->mMargin.GetRight());
// According to the CSS2 spec, margin percentages are
// calculated with respect to the *width* of the containing