Rename new width keywords to match CSS WG decision. b=402706 r+sr=bzbarsky a=blocking1.9+
This commit is contained in:
@@ -120,8 +120,8 @@ FixedTableLayoutStrategy::GetMinWidth(nsIRenderingContext* aRenderingContext)
|
||||
if (styleWidth->GetUnit() == eStyleUnit_Coord ||
|
||||
styleWidth->GetUnit() == eStyleUnit_Chars ||
|
||||
(styleWidth->GetUnit() == eStyleUnit_Enumerated &&
|
||||
(styleWidth->GetIntValue() == NS_STYLE_WIDTH_INTRINSIC ||
|
||||
styleWidth->GetIntValue() == NS_STYLE_WIDTH_MIN_INTRINSIC))) {
|
||||
(styleWidth->GetIntValue() == NS_STYLE_WIDTH_MAX_CONTENT ||
|
||||
styleWidth->GetIntValue() == NS_STYLE_WIDTH_MIN_CONTENT))) {
|
||||
nscoord cellWidth = nsLayoutUtils::IntrinsicForContainer(
|
||||
aRenderingContext, cellFrame, nsLayoutUtils::MIN_WIDTH);
|
||||
if (colSpan > 1) {
|
||||
@@ -139,7 +139,7 @@ FixedTableLayoutStrategy::GetMinWidth(nsIRenderingContext* aRenderingContext)
|
||||
result -= spacing * (colSpan - 1);
|
||||
}
|
||||
}
|
||||
// else, for 'auto', '-moz-fill', and '-moz-shrink-wrap'
|
||||
// else, for 'auto', '-moz-available', and '-moz-fit-content'
|
||||
// do nothing
|
||||
}
|
||||
}
|
||||
@@ -242,8 +242,8 @@ FixedTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowSt
|
||||
if (styleWidth->GetUnit() == eStyleUnit_Coord ||
|
||||
styleWidth->GetUnit() == eStyleUnit_Chars ||
|
||||
(styleWidth->GetUnit() == eStyleUnit_Enumerated &&
|
||||
(styleWidth->GetIntValue() == NS_STYLE_WIDTH_INTRINSIC ||
|
||||
styleWidth->GetIntValue() == NS_STYLE_WIDTH_MIN_INTRINSIC))) {
|
||||
(styleWidth->GetIntValue() == NS_STYLE_WIDTH_MAX_CONTENT ||
|
||||
styleWidth->GetIntValue() == NS_STYLE_WIDTH_MIN_CONTENT))) {
|
||||
// XXX This should use real percentage padding
|
||||
// Note that the difference between MIN_WIDTH and
|
||||
// PREF_WIDTH shouldn't matter for any of these
|
||||
@@ -264,7 +264,7 @@ FixedTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowSt
|
||||
colFrame->AddPrefPercent(pct);
|
||||
pctTotal += pct;
|
||||
} else {
|
||||
// 'auto', '-moz-fill', and '-moz-shrink-wrap'
|
||||
// 'auto', '-moz-available', and '-moz-fit-content'
|
||||
colWidth = unassignedMarker;
|
||||
}
|
||||
if (colWidth != unassignedMarker) {
|
||||
|
||||
Reference in New Issue
Block a user