mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Rename new width keywords to match CSS WG decision. b=402706 r+sr=bzbarsky a=blocking1.9+

This commit is contained in:
dbaron%dbaron.org 2007-11-15 18:10:32 +00:00
Родитель 79c3fd8237
Коммит 2f88398798
32 изменённых файлов: 244 добавлений и 244 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

48
layout/base/nsLayoutUtils.cpp
Просмотреть файл

@ -1335,9 +1335,9 @@ GetPercentHeight(const nsStyleCoord& aStyle,
return PR_TRUE;
}
// Handles only -moz-intrinsic and -moz-min-intrinsic, and
// -moz-shrink-wrap for min-width and max-width, since the others
// (-moz-shrink-wrap for width, and -moz-fill) have no effect on
// Handles only -moz-max-content and -moz-min-content, and
// -moz-fit-content for min-width and max-width, since the others
// (-moz-fit-content for width, and -moz-available) have no effect on
// intrinsic widths.
enum eWidthProperty { PROP_WIDTH, PROP_MAX_WIDTH, PROP_MIN_WIDTH };
static PRBool
@ -1352,28 +1352,28 @@ GetIntrinsicCoord(const nsStyleCoord& aStyle,
if (aStyle.GetUnit() != eStyleUnit_Enumerated)
return PR_FALSE;
PRInt32 val = aStyle.GetIntValue();
NS_ASSERTION(val == NS_STYLE_WIDTH_INTRINSIC ||
val == NS_STYLE_WIDTH_MIN_INTRINSIC ||
val == NS_STYLE_WIDTH_SHRINK_WRAP ||
val == NS_STYLE_WIDTH_FILL,
NS_ASSERTION(val == NS_STYLE_WIDTH_MAX_CONTENT ||
val == NS_STYLE_WIDTH_MIN_CONTENT ||
val == NS_STYLE_WIDTH_FIT_CONTENT ||
val == NS_STYLE_WIDTH_AVAILABLE,
"unexpected enumerated value for width property");
if (val == NS_STYLE_WIDTH_FILL)
if (val == NS_STYLE_WIDTH_AVAILABLE)
return PR_FALSE;
if (val == NS_STYLE_WIDTH_SHRINK_WRAP) {
if (val == NS_STYLE_WIDTH_FIT_CONTENT) {
if (aProperty == PROP_WIDTH)
return PR_FALSE; // handle like 'width: auto'
if (aProperty == PROP_MAX_WIDTH)
// constrain large 'width' values down to -moz-intrinsic
val = NS_STYLE_WIDTH_INTRINSIC;
// constrain large 'width' values down to -moz-max-content
val = NS_STYLE_WIDTH_MAX_CONTENT;
else
// constrain small 'width' or 'max-width' values up to -moz-min-intrinsic
val = NS_STYLE_WIDTH_MIN_INTRINSIC;
// constrain small 'width' or 'max-width' values up to -moz-min-content
val = NS_STYLE_WIDTH_MIN_CONTENT;
}
NS_ASSERTION(val == NS_STYLE_WIDTH_INTRINSIC ||
val == NS_STYLE_WIDTH_MIN_INTRINSIC,
NS_ASSERTION(val == NS_STYLE_WIDTH_MAX_CONTENT ||
val == NS_STYLE_WIDTH_MIN_CONTENT,
"should have reduced everything remaining to one of these");
if (val == NS_STYLE_WIDTH_INTRINSIC)
if (val == NS_STYLE_WIDTH_MAX_CONTENT)
aResult = aFrame->GetPrefWidth(aRenderingContext);
else
aResult = aFrame->GetMinWidth(aRenderingContext);
@ -1426,11 +1426,11 @@ nsLayoutUtils::IntrinsicForContainer(nsIRenderingContext *aRenderingContext,
// than the specified 'max-width', which works out to the same thing),
// don't even bother getting the frame's intrinsic width.
if (styleWidth.GetUnit() == eStyleUnit_Enumerated &&
(styleWidth.GetIntValue() == NS_STYLE_WIDTH_INTRINSIC ||
styleWidth.GetIntValue() == NS_STYLE_WIDTH_MIN_INTRINSIC)) {
// -moz-shrink-wrap and -moz-fill enumerated widths compute intrinsic
(styleWidth.GetIntValue() == NS_STYLE_WIDTH_MAX_CONTENT ||
styleWidth.GetIntValue() == NS_STYLE_WIDTH_MIN_CONTENT)) {
// -moz-fit-content and -moz-available enumerated widths compute intrinsic
// widths just like auto.
// For -moz-intrinsic and -moz-min-intrinsic, we handle them like
// For -moz-max-content and -moz-min-content, we handle them like
// specified widths, but ignore -moz-box-sizing.
boxSizing = NS_STYLE_BOX_SIZING_CONTENT;
} else if (styleWidth.GetUnit() != eStyleUnit_Coord &&
@ -1653,15 +1653,15 @@ nsLayoutUtils::ComputeWidthValue(
} else if (eStyleUnit_Enumerated == aCoord.GetUnit()) {
PRInt32 val = aCoord.GetIntValue();
switch (val) {
case NS_STYLE_WIDTH_INTRINSIC:
case NS_STYLE_WIDTH_MAX_CONTENT:
result = aFrame->GetPrefWidth(aRenderingContext);
NS_ASSERTION(result >= 0, "width less than zero");
break;
case NS_STYLE_WIDTH_MIN_INTRINSIC:
case NS_STYLE_WIDTH_MIN_CONTENT:
result = aFrame->GetMinWidth(aRenderingContext);
NS_ASSERTION(result >= 0, "width less than zero");
break;
case NS_STYLE_WIDTH_SHRINK_WRAP:
case NS_STYLE_WIDTH_FIT_CONTENT:
{
nscoord pref = aFrame->GetPrefWidth(aRenderingContext),
min = aFrame->GetMinWidth(aRenderingContext),
@ -1671,7 +1671,7 @@ nsLayoutUtils::ComputeWidthValue(
NS_ASSERTION(result >= 0, "width less than zero");
}
break;
case NS_STYLE_WIDTH_FILL:
case NS_STYLE_WIDTH_AVAILABLE:
result = aContainingBlockWidth -
(aBoxSizingToMarginEdge + aContentEdgeToBoxSizing);
}

8
layout/base/nsStyleConsts.h
Просмотреть файл

@ -429,10 +429,10 @@
#define NS_STYLE_FONT_FIELD 16
// See nsStylePosition::mWidth, mMinWidth, mMaxWidth
#define NS_STYLE_WIDTH_INTRINSIC 0
#define NS_STYLE_WIDTH_MIN_INTRINSIC 1
#define NS_STYLE_WIDTH_SHRINK_WRAP 2
#define NS_STYLE_WIDTH_FILL 3
#define NS_STYLE_WIDTH_MAX_CONTENT 0
#define NS_STYLE_WIDTH_MIN_CONTENT 1
#define NS_STYLE_WIDTH_FIT_CONTENT 2
#define NS_STYLE_WIDTH_AVAILABLE 3
// See nsStylePosition.mPosition
#define NS_STYLE_POSITION_STATIC 0

6
layout/generic/nsAbsoluteContainingBlock.cpp
Просмотреть файл

@ -231,8 +231,8 @@ static inline PRBool IsFixedWidth(const nsStyleCoord& aCoord)
return aCoord.GetUnit() == eStyleUnit_Coord ||
aCoord.GetUnit() == eStyleUnit_Chars ||
(aCoord.GetUnit() == eStyleUnit_Enumerated &&
(aCoord.GetIntValue() == NS_STYLE_WIDTH_INTRINSIC ||
aCoord.GetIntValue() == NS_STYLE_WIDTH_MIN_INTRINSIC));
(aCoord.GetIntValue() == NS_STYLE_WIDTH_MAX_CONTENT ||
aCoord.GetIntValue() == NS_STYLE_WIDTH_MIN_CONTENT));
}
static inline PRBool IsFixedMaxWidth(const nsStyleCoord& aCoord)
@ -276,7 +276,7 @@ nsAbsoluteContainingBlock::FrameDependsOnContainer(nsIFrame* f,
// width, min-width, and max-width are all lengths, 'none', or enumerated,
// then our frame width does not depend on the parent width.
// Note that borders never depend on the parent width
// XXX All of the enumerated values except -moz-fill are ok too.
// XXX All of the enumerated values except -moz-available are ok too.
if (!IsFixedWidth(pos->mWidth) ||
!IsFixedWidth(pos->mMinWidth) ||
!IsFixedMaxWidth(pos->mMaxWidth) ||

4
layout/generic/nsLineLayout.cpp
Просмотреть файл

@ -702,8 +702,8 @@ WidthDependsOnContainer(const nsStyleCoord& aCoord)
{
return aCoord.GetUnit() == eStyleUnit_Percent ||
(aCoord.GetUnit() == eStyleUnit_Enumerated &&
(aCoord.GetIntValue() == NS_STYLE_WIDTH_FILL ||
aCoord.GetIntValue() == NS_STYLE_WIDTH_SHRINK_WRAP));
(aCoord.GetIntValue() == NS_STYLE_WIDTH_AVAILABLE ||
aCoord.GetIntValue() == NS_STYLE_WIDTH_FIT_CONTENT));
}

2
layout/reftests/bidi/bidi-006-j.html
Просмотреть файл

@ -38,7 +38,7 @@ span {
p#test {
border-left: 3em solid red;
border-right: 3em solid red;
width: -moz-intrinsic;
width: -moz-max-content;
width: intrinsic;
}
</style>

2
layout/reftests/bidi/bidi-006.html
Просмотреть файл

@ -37,7 +37,7 @@ span {
p#test {
border-left: 3em solid red;
border-right: 3em solid red;
width: -moz-intrinsic;
width: -moz-max-content;
width: intrinsic;
}
</style>

24
layout/reftests/box-properties/box-sizing-1.html
Просмотреть файл

@ -38,10 +38,10 @@
<!-- -moz-box-sizing: content-box -->
<div style="width: auto">A B</div>
<div style="width: -moz-intrinsic">A B</div>
<div style="width: -moz-min-intrinsic">A B</div>
<div style="width: -moz-shrink-wrap">A B</div>
<div style="width: -moz-fill">A B</div>
<div style="width: -moz-max-content">A B</div>
<div style="width: -moz-min-content">A B</div>
<div style="width: -moz-fit-content">A B</div>
<div style="width: -moz-available">A B</div>
<div style="width: 50px">A B</div>
<div style="width: 60%">A B</div>
@ -50,10 +50,10 @@
<td id="bspadding"><div>
<!-- -moz-box-sizing: padding-box -->
<div style="width: auto">A B</div>
<div style="width: -moz-intrinsic">A B</div>
<div style="width: -moz-min-intrinsic">A B</div>
<div style="width: -moz-shrink-wrap">A B</div>
<div style="width: -moz-fill">A B</div>
<div style="width: -moz-max-content">A B</div>
<div style="width: -moz-min-content">A B</div>
<div style="width: -moz-fit-content">A B</div>
<div style="width: -moz-available">A B</div>
<div style="width: 50px">A B</div>
<div style="width: 60%">A B</div>
@ -62,10 +62,10 @@
<td id="bsborder"><div>
<!-- -moz-box-sizing: border-box -->
<div style="width: auto">A B</div>
<div style="width: -moz-intrinsic">A B</div>
<div style="width: -moz-min-intrinsic">A B</div>
<div style="width: -moz-shrink-wrap">A B</div>
<div style="width: -moz-fill">A B</div>
<div style="width: -moz-max-content">A B</div>
<div style="width: -moz-min-content">A B</div>
<div style="width: -moz-fit-content">A B</div>
<div style="width: -moz-available">A B</div>
<div style="width: 50px">A B</div>
<div style="width: 60%">A B</div>

24
layout/reftests/box-properties/box-sizing-2.html
Просмотреть файл

@ -35,10 +35,10 @@
<!-- -moz-box-sizing: content-box -->
<table><tr><td><div style="width: auto">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-intrinsic">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-min-intrinsic">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-shrink-wrap">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-fill">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-max-content">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-min-content">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-fit-content">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-available">A B</div></td></tr></table>
<table><tr><td><div style="width: 150px">A B</div></td></tr></table>
</td>
@ -46,10 +46,10 @@
<td id="bspadding">
<!-- -moz-box-sizing: padding-box -->
<table><tr><td><div style="width: auto">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-intrinsic">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-min-intrinsic">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-shrink-wrap">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-fill">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-max-content">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-min-content">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-fit-content">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-available">A B</div></td></tr></table>
<table><tr><td><div style="width: 150px">A B</div></td></tr></table>
</td>
@ -57,10 +57,10 @@
<td id="bsborder">
<!-- -moz-box-sizing: border-box -->
<table><tr><td><div style="width: auto">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-intrinsic">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-min-intrinsic">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-shrink-wrap">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-fill">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-max-content">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-min-content">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-fit-content">A B</div></td></tr></table>
<table><tr><td><div style="width: -moz-available">A B</div></td></tr></table>
<table><tr><td><div style="width: 150px">A B</div></td></tr></table>
</td>

24
layout/reftests/box-properties/box-sizing-3.html
Просмотреть файл

@ -38,10 +38,10 @@
<!-- -moz-box-sizing: content-box -->
<div style="width: auto">A B</div>
<div style="width: -moz-intrinsic">A B</div>
<div style="width: -moz-min-intrinsic">A B</div>
<div style="width: -moz-shrink-wrap">A B</div>
<div style="width: -moz-fill">A B</div>
<div style="width: -moz-max-content">A B</div>
<div style="width: -moz-min-content">A B</div>
<div style="width: -moz-fit-content">A B</div>
<div style="width: -moz-available">A B</div>
<div style="width: 50px">A B</div>
<div style="width: 60%">A B</div>
@ -50,10 +50,10 @@
<td id="bspadding"><div>
<!-- -moz-box-sizing: padding-box -->
<div style="width: auto">A B</div>
<div style="width: -moz-intrinsic">A B</div>
<div style="width: -moz-min-intrinsic">A B</div>
<div style="width: -moz-shrink-wrap">A B</div>
<div style="width: -moz-fill">A B</div>
<div style="width: -moz-max-content">A B</div>
<div style="width: -moz-min-content">A B</div>
<div style="width: -moz-fit-content">A B</div>
<div style="width: -moz-available">A B</div>
<div style="width: 50px">A B</div>
<div style="width: 60%">A B</div>
@ -62,10 +62,10 @@
<td id="bsborder"><div>
<!-- -moz-box-sizing: border-box -->
<div style="width: auto">A B</div>
<div style="width: -moz-intrinsic">A B</div>
<div style="width: -moz-min-intrinsic">A B</div>
<div style="width: -moz-shrink-wrap">A B</div>
<div style="width: -moz-fill">A B</div>
<div style="width: -moz-max-content">A B</div>
<div style="width: -moz-min-content">A B</div>
<div style="width: -moz-fit-content">A B</div>
<div style="width: -moz-available">A B</div>
<div style="width: 50px">A B</div>
<div style="width: 60%">A B</div>

24
layout/reftests/box-properties/box-sizing-4.html
Просмотреть файл

@ -50,10 +50,10 @@
<!-- -moz-box-sizing: content-box -->
<div style="width: auto">A B</div>
<div style="width: -moz-intrinsic">A B</div>
<div style="width: -moz-min-intrinsic">A B</div>
<div style="width: -moz-shrink-wrap">A B</div>
<div style="width: -moz-fill">A B</div>
<div style="width: -moz-max-content">A B</div>
<div style="width: -moz-min-content">A B</div>
<div style="width: -moz-fit-content">A B</div>
<div style="width: -moz-available">A B</div>
<div style="width: 50px">A B</div>
<div style="width: 60%">A B</div>
@ -62,10 +62,10 @@
<td id="bspadding"><div>
<!-- -moz-box-sizing: padding-box -->
<div style="width: auto">A B</div>
<div style="width: -moz-intrinsic">A B</div>
<div style="width: -moz-min-intrinsic">A B</div>
<div style="width: -moz-shrink-wrap">A B</div>
<div style="width: -moz-fill">A B</div>
<div style="width: -moz-max-content">A B</div>
<div style="width: -moz-min-content">A B</div>
<div style="width: -moz-fit-content">A B</div>
<div style="width: -moz-available">A B</div>
<div style="width: 50px">A B</div>
<div style="width: 60%">A B</div>
@ -74,10 +74,10 @@
<td id="bsborder"><div>
<!-- -moz-box-sizing: border-box -->
<div style="width: auto">A B</div>
<div style="width: -moz-intrinsic">A B</div>
<div style="width: -moz-min-intrinsic">A B</div>
<div style="width: -moz-shrink-wrap">A B</div>
<div style="width: -moz-fill">A B</div>
<div style="width: -moz-max-content">A B</div>
<div style="width: -moz-min-content">A B</div>
<div style="width: -moz-fit-content">A B</div>
<div style="width: -moz-available">A B</div>
<div style="width: 50px">A B</div>
<div style="width: 60%">A B</div>

2
layout/reftests/box-properties/minmax-width-special-values-block-intrinsic-ref.html
Просмотреть файл

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<title>intrinsic min-widths and max-widths for -moz-intrinsic, -moz-min-intrinsic, -moz-shrink-wrap, and -moz-fill values of CSS width property, on blocks</title>
<title>intrinsic min-widths and max-widths for -moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="Content-Style-Type" content="text/css">
</head>

34
layout/reftests/box-properties/minmax-width-special-values-block-intrinsic.html
Просмотреть файл

@ -1,74 +1,74 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<title>intrinsic min-widths and max-widths for -moz-intrinsic, -moz-min-intrinsic, -moz-shrink-wrap, and -moz-fill values of CSS width property, on blocks</title>
<title>intrinsic min-widths and max-widths for -moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="Content-Style-Type" content="text/css">
</head>
<body>
<table border><tr><td>
<div style="width: 1px; min-width: -moz-intrinsic">AA B</div>
<div style="width: 1px; min-width: -moz-max-content">AA B</div>
</td></tr></table>
<table border width="1"><tr><td>
<div style="width: 1px; min-width: -moz-intrinsic">AA B</div>
<div style="width: 1px; min-width: -moz-max-content">AA B</div>
</td></tr></table>
<table border><tr><td>
<div style="width: 1px; min-width: -moz-min-intrinsic">AA B</div>
<div style="width: 1px; min-width: -moz-min-content">AA B</div>
</td></tr></table>
<table border width="1"><tr><td>
<div style="width: 1px; min-width: -moz-min-intrinsic">AA B</div>
<div style="width: 1px; min-width: -moz-min-content">AA B</div>
</td></tr></table>
<table border><tr><td>
<div style="width: 1px; min-width: -moz-shrink-wrap">AA B</div>
<div style="width: 1px; min-width: -moz-fit-content">AA B</div>
</td></tr></table>
<table border width="1"><tr><td>
<div style="width: 1px; min-width: -moz-shrink-wrap">AA B</div>
<div style="width: 1px; min-width: -moz-fit-content">AA B</div>
</td></tr></table>
<table border><tr><td>
<div style="width: 1px; min-width: -moz-fill">AA B</div>
<div style="width: 1px; min-width: -moz-available">AA B</div>
</td></tr></table>
<table border width="1"><tr><td>
<div style="width: 1px; min-width: -moz-fill">AA B</div>
<div style="width: 1px; min-width: -moz-available">AA B</div>
</td></tr></table>
<table border><tr><td>
<div style="width: 500px; max-width: -moz-intrinsic">AA B</div>
<div style="width: 500px; max-width: -moz-max-content">AA B</div>
</td></tr></table>
<table border width="1"><tr><td>
<div style="width: 500px; max-width: -moz-intrinsic">AA B</div>
<div style="width: 500px; max-width: -moz-max-content">AA B</div>
</td></tr></table>
<table border><tr><td>
<div style="width: 500px; max-width: -moz-min-intrinsic">AA B</div>
<div style="width: 500px; max-width: -moz-min-content">AA B</div>
</td></tr></table>
<table border width="1"><tr><td>
<div style="width: 500px; max-width: -moz-min-intrinsic">AA B</div>
<div style="width: 500px; max-width: -moz-min-content">AA B</div>
</td></tr></table>
<table border><tr><td>
<div style="width: 500px; max-width: -moz-shrink-wrap">AA B</div>
<div style="width: 500px; max-width: -moz-fit-content">AA B</div>
</td></tr></table>
<table border width="1"><tr><td>
<div style="width: 500px; max-width: -moz-shrink-wrap">AA B</div>
<div style="width: 500px; max-width: -moz-fit-content">AA B</div>
</td></tr></table>
<table border><tr><td>
<div style="width: 500px; max-width: -moz-fill">AA B</div>
<div style="width: 500px; max-width: -moz-available">AA B</div>
</td></tr></table>
<table border width="1"><tr><td>
<div style="width: 500px; max-width: -moz-fill">AA B</div>
<div style="width: 500px; max-width: -moz-available">AA B</div>
</td></tr></table>
</body>

2
layout/reftests/box-properties/width-special-values-block-intrinsic-ref.html
Просмотреть файл

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<title>intrinsic widths for -moz-intrinsic, -moz-min-intrinsic, -moz-shrink-wrap, and -moz-fill values of CSS width property, on blocks</title>
<title>intrinsic widths for -moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="Content-Style-Type" content="text/css">
</head>

18
layout/reftests/box-properties/width-special-values-block-intrinsic.html
Просмотреть файл

@ -1,42 +1,42 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<title>intrinsic widths for -moz-intrinsic, -moz-min-intrinsic, -moz-shrink-wrap, and -moz-fill values of CSS width property, on blocks</title>
<title>intrinsic widths for -moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="Content-Style-Type" content="text/css">
</head>
<body>
<table border><tr><td>
<div style="width: -moz-intrinsic">AA B</div>
<div style="width: -moz-max-content">AA B</div>
</td></tr></table>
<table border width="1"><tr><td>
<div style="width: -moz-intrinsic">AA B</div>
<div style="width: -moz-max-content">AA B</div>
</td></tr></table>
<table border><tr><td>
<div style="width: -moz-min-intrinsic">AA B</div>
<div style="width: -moz-min-content">AA B</div>
</td></tr></table>
<table border width="1"><tr><td>
<div style="width: -moz-min-intrinsic">AA B</div>
<div style="width: -moz-min-content">AA B</div>
</td></tr></table>
<table border><tr><td>
<div style="width: -moz-shrink-wrap">AA B</div>
<div style="width: -moz-fit-content">AA B</div>
</td></tr></table>
<table border width="1"><tr><td>
<div style="width: -moz-shrink-wrap">AA B</div>
<div style="width: -moz-fit-content">AA B</div>
</td></tr></table>
<table border><tr><td>
<div style="width: -moz-fill">AA B</div>
<div style="width: -moz-available">AA B</div>
</td></tr></table>
<table border width="1"><tr><td>
<div style="width: -moz-fill">AA B</div>
<div style="width: -moz-available">AA B</div>
</td></tr></table>
</body>

2
layout/reftests/box-properties/width-special-values-block-ref.html
Просмотреть файл

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<title>-moz-intrinsic, -moz-min-intrinsic, -moz-shrink-wrap, and -moz-fill values of CSS width property, on blocks</title>
<title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css">

10
layout/reftests/box-properties/width-special-values-block.html
Просмотреть файл

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<title>-moz-intrinsic, -moz-min-intrinsic, -moz-shrink-wrap, and -moz-fill values of CSS width property, on blocks</title>
<title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css">
@ -20,10 +20,10 @@
margin-bottom: 1px;
}
div.v1 { width: -moz-intrinsic; }
div.v2 { width: -moz-min-intrinsic; }
div.v3 { width: -moz-shrink-wrap; }
div.v4 { width: -moz-fill; }
div.v1 { width: -moz-max-content; }
div.v2 { width: -moz-min-content; }
div.v3 { width: -moz-fit-content; }
div.v4 { width: -moz-available; }
div.s1 { -moz-box-sizing: content; }
div.s2 { -moz-box-sizing: padding; }

2
layout/reftests/box-properties/width-special-values-cell-auto-ref.html
Просмотреть файл

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<title>-moz-intrinsic, -moz-min-intrinsic, -moz-shrink-wrap, and -moz-fill values of CSS width property, on table cells with table-layout: auto</title>
<title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on table cells with table-layout: auto</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css">

82
layout/reftests/box-properties/width-special-values-cell-auto.html
Просмотреть файл

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<title>-moz-intrinsic, -moz-min-intrinsic, -moz-shrink-wrap, and -moz-fill values of CSS width property, on table cells with table-layout: auto</title>
<title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on table cells with table-layout: auto</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css">
@ -24,58 +24,58 @@
<table border><tr>
<td>
<!-- width -->
<table border><tr><td style="width: -moz-intrinsic">A B</td></tr></table>
<table border width="1"><tr><td style="width: -moz-intrinsic">A B</td></tr></table>
<table border><tr><td style="width: -moz-min-intrinsic">A B</td></tr></table>
<table border width="1"><tr><td style="width: -moz-min-intrinsic">A B</td></tr></table>
<table border><tr><td style="width: -moz-shrink-wrap">A B</td></tr></table>
<table border width="1"><tr><td style="width: -moz-shrink-wrap">A B</td></tr></table>
<table border><tr><td style="width: -moz-fill">A B</td></tr></table>
<table border width="1"><tr><td style="width: -moz-fill">A B</td></tr></table>
<table border><tr><td style="width: -moz-max-content">A B</td></tr></table>
<table border width="1"><tr><td style="width: -moz-max-content">A B</td></tr></table>
<table border><tr><td style="width: -moz-min-content">A B</td></tr></table>
<table border width="1"><tr><td style="width: -moz-min-content">A B</td></tr></table>
<table border><tr><td style="width: -moz-fit-content">A B</td></tr></table>
<table border width="1"><tr><td style="width: -moz-fit-content">A B</td></tr></table>
<table border><tr><td style="width: -moz-available">A B</td></tr></table>
<table border width="1"><tr><td style="width: -moz-available">A B</td></tr></table>
</td>
<td>
<!-- min-width -->
<table border><tr><td style="min-width: -moz-intrinsic">A B</td></tr></table>
<table border width="1"><tr><td style="min-width: -moz-intrinsic">A B</td></tr></table>
<table border><tr><td style="min-width: -moz-min-intrinsic">A B</td></tr></table>
<table border width="1"><tr><td style="min-width: -moz-min-intrinsic">A B</td></tr></table>
<table border><tr><td style="min-width: -moz-shrink-wrap">A B</td></tr></table>
<table border width="1"><tr><td style="min-width: -moz-shrink-wrap">A B</td></tr></table>
<table border><tr><td style="min-width: -moz-fill">A B</td></tr></table>
<table border width="1"><tr><td style="min-width: -moz-fill">A B</td></tr></table>
<table border><tr><td style="min-width: -moz-max-content">A B</td></tr></table>
<table border width="1"><tr><td style="min-width: -moz-max-content">A B</td></tr></table>
<table border><tr><td style="min-width: -moz-min-content">A B</td></tr></table>
<table border width="1"><tr><td style="min-width: -moz-min-content">A B</td></tr></table>
<table border><tr><td style="min-width: -moz-fit-content">A B</td></tr></table>
<table border width="1"><tr><td style="min-width: -moz-fit-content">A B</td></tr></table>
<table border><tr><td style="min-width: -moz-available">A B</td></tr></table>
<table border width="1"><tr><td style="min-width: -moz-available">A B</td></tr></table>
<table border><tr><td style="width: 1px; min-width: -moz-intrinsic">A B</td></tr></table>
<table border width="1"><tr><td style="width: 1px; min-width: -moz-intrinsic">A B</td></tr></table>
<table border><tr><td style="width: 1px; min-width: -moz-min-intrinsic">A B</td></tr></table>
<table border width="1"><tr><td style="width: 1px; min-width: -moz-min-intrinsic">A B</td></tr></table>
<table border><tr><td style="width: 1px; min-width: -moz-shrink-wrap">A B</td></tr></table>
<table border width="1"><tr><td style="width: 1px; min-width: -moz-shrink-wrap">A B</td></tr></table>
<table border><tr><td style="width: 1px; min-width: -moz-fill">A B</td></tr></table>
<table border width="1"><tr><td style="width: 1px; min-width: -moz-fill">A B</td></tr></table>
<table border><tr><td style="width: 1px; min-width: -moz-max-content">A B</td></tr></table>
<table border width="1"><tr><td style="width: 1px; min-width: -moz-max-content">A B</td></tr></table>
<table border><tr><td style="width: 1px; min-width: -moz-min-content">A B</td></tr></table>
<table border width="1"><tr><td style="width: 1px; min-width: -moz-min-content">A B</td></tr></table>
<table border><tr><td style="width: 1px; min-width: -moz-fit-content">A B</td></tr></table>
<table border width="1"><tr><td style="width: 1px; min-width: -moz-fit-content">A B</td></tr></table>
<table border><tr><td style="width: 1px; min-width: -moz-available">A B</td></tr></table>
<table border width="1"><tr><td style="width: 1px; min-width: -moz-available">A B</td></tr></table>
</td>
<td>
<!-- max-width -->
<table border><tr><td style="max-width: -moz-intrinsic">A B</td></tr></table>
<table border width="1"><tr><td style="max-width: -moz-intrinsic">A B</td></tr></table>
<table border><tr><td style="max-width: -moz-min-intrinsic">A B</td></tr></table>
<table border width="1"><tr><td style="max-width: -moz-min-intrinsic">A B</td></tr></table>
<table border><tr><td style="max-width: -moz-shrink-wrap">A B</td></tr></table>
<table border width="1"><tr><td style="max-width: -moz-shrink-wrap">A B</td></tr></table>
<table border><tr><td style="max-width: -moz-fill">A B</td></tr></table>
<table border width="1"><tr><td style="max-width: -moz-fill">A B</td></tr></table>
<table border><tr><td style="max-width: -moz-max-content">A B</td></tr></table>
<table border width="1"><tr><td style="max-width: -moz-max-content">A B</td></tr></table>
<table border><tr><td style="max-width: -moz-min-content">A B</td></tr></table>
<table border width="1"><tr><td style="max-width: -moz-min-content">A B</td></tr></table>
<table border><tr><td style="max-width: -moz-fit-content">A B</td></tr></table>
<table border width="1"><tr><td style="max-width: -moz-fit-content">A B</td></tr></table>
<table border><tr><td style="max-width: -moz-available">A B</td></tr></table>
<table border width="1"><tr><td style="max-width: -moz-available">A B</td></tr></table>
<table border><tr><td style="width: 150px; max-width: -moz-intrinsic">A B</td></tr></table>
<table border width="1"><tr><td style="width: 150px; max-width: -moz-intrinsic">A B</td></tr></table>
<table border><tr><td style="width: 150px; max-width: -moz-min-intrinsic">A B</td></tr></table>
<table border width="1"><tr><td style="width: 150px; max-width: -moz-min-intrinsic">A B</td></tr></table>
<table border><tr><td style="width: 150px; max-width: -moz-shrink-wrap">A B</td></tr></table>
<table border width="1"><tr><td style="width: 150px; max-width: -moz-shrink-wrap">A B</td></tr></table>
<table border><tr><td style="width: 150px; max-width: -moz-fill">A B</td></tr></table>
<table border width="1"><tr><td style="width: 150px; max-width: -moz-fill">A B</td></tr></table>
<table border><tr><td style="width: 150px; max-width: -moz-max-content">A B</td></tr></table>
<table border width="1"><tr><td style="width: 150px; max-width: -moz-max-content">A B</td></tr></table>
<table border><tr><td style="width: 150px; max-width: -moz-min-content">A B</td></tr></table>
<table border width="1"><tr><td style="width: 150px; max-width: -moz-min-content">A B</td></tr></table>
<table border><tr><td style="width: 150px; max-width: -moz-fit-content">A B</td></tr></table>
<table border width="1"><tr><td style="width: 150px; max-width: -moz-fit-content">A B</td></tr></table>
<table border><tr><td style="width: 150px; max-width: -moz-available">A B</td></tr></table>
<table border width="1"><tr><td style="width: 150px; max-width: -moz-available">A B</td></tr></table>
</td>

2
layout/reftests/box-properties/width-special-values-cell-fixed-ref.html
Просмотреть файл

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<title>-moz-intrinsic, -moz-min-intrinsic, -moz-shrink-wrap, and -moz-fill values of CSS width property, on table cells with table-layout: fixed</title>
<title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on table cells with table-layout: fixed</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css">

42
layout/reftests/box-properties/width-special-values-cell-fixed.html
Просмотреть файл

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<title>-moz-intrinsic, -moz-min-intrinsic, -moz-shrink-wrap, and -moz-fill values of CSS width property, on table cells with table-layout: fixed</title>
<title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on table cells with table-layout: fixed</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css">
@ -25,38 +25,38 @@
<table border><tr>
<td>
<!-- width -->
<table border><tr><td style="width: -moz-intrinsic">A B</td><td></td></tr></table>
<table border><tr><td style="width: -moz-min-intrinsic">A B</td><td></td></tr></table>
<table border><tr><td style="width: -moz-shrink-wrap">A B</td><td></td></tr></table>
<table border><tr><td style="width: -moz-fill">A B</td><td></td></tr></table>
<table border><tr><td style="width: -moz-max-content">A B</td><td></td></tr></table>
<table border><tr><td style="width: -moz-min-content">A B</td><td></td></tr></table>
<table border><tr><td style="width: -moz-fit-content">A B</td><td></td></tr></table>
<table border><tr><td style="width: -moz-available">A B</td><td></td></tr></table>
</td>
<td>
<!-- min-width -->
<table border><tr><td style="min-width: -moz-intrinsic">A B</td><td></td></tr></table>
<table border><tr><td style="min-width: -moz-min-intrinsic">A B</td><td></td></tr></table>
<table border><tr><td style="min-width: -moz-shrink-wrap">A B</td><td></td></tr></table>
<table border><tr><td style="min-width: -moz-fill">A B</td><td></td></tr></table>
<table border><tr><td style="min-width: -moz-max-content">A B</td><td></td></tr></table>
<table border><tr><td style="min-width: -moz-min-content">A B</td><td></td></tr></table>
<table border><tr><td style="min-width: -moz-fit-content">A B</td><td></td></tr></table>
<table border><tr><td style="min-width: -moz-available">A B</td><td></td></tr></table>
<table border><tr><td style="width: 1px; min-width: -moz-intrinsic">A B</td><td></td></tr></table>
<table border><tr><td style="width: 1px; min-width: -moz-min-intrinsic">A B</td><td></td></tr></table>
<table border><tr><td style="width: 1px; min-width: -moz-shrink-wrap">A B</td><td></td></tr></table>
<table border><tr><td style="width: 1px; min-width: -moz-fill">A B</td><td></td></tr></table>
<table border><tr><td style="width: 1px; min-width: -moz-max-content">A B</td><td></td></tr></table>
<table border><tr><td style="width: 1px; min-width: -moz-min-content">A B</td><td></td></tr></table>
<table border><tr><td style="width: 1px; min-width: -moz-fit-content">A B</td><td></td></tr></table>
<table border><tr><td style="width: 1px; min-width: -moz-available">A B</td><td></td></tr></table>
</td>
<td>
<!-- max-width -->
<table border><tr><td style="max-width: -moz-intrinsic">A B</td><td></td></tr></table>
<table border><tr><td style="max-width: -moz-min-intrinsic">A B</td><td></td></tr></table>
<table border><tr><td style="max-width: -moz-shrink-wrap">A B</td><td></td></tr></table>
<table border><tr><td style="max-width: -moz-fill">A B</td><td></td></tr></table>
<table border><tr><td style="max-width: -moz-max-content">A B</td><td></td></tr></table>
<table border><tr><td style="max-width: -moz-min-content">A B</td><td></td></tr></table>
<table border><tr><td style="max-width: -moz-fit-content">A B</td><td></td></tr></table>
<table border><tr><td style="max-width: -moz-available">A B</td><td></td></tr></table>
<table border><tr><td style="width: 150px; max-width: -moz-intrinsic">A B</td><td></td></tr></table>
<table border><tr><td style="width: 150px; max-width: -moz-min-intrinsic">A B</td><td></td></tr></table>
<table border><tr><td style="width: 150px; max-width: -moz-shrink-wrap">A B</td><td></td></tr></table>
<table border><tr><td style="width: 150px; max-width: -moz-fill">A B</td><td></td></tr></table>
<table border><tr><td style="width: 150px; max-width: -moz-max-content">A B</td><td></td></tr></table>
<table border><tr><td style="width: 150px; max-width: -moz-min-content">A B</td><td></td></tr></table>
<table border><tr><td style="width: 150px; max-width: -moz-fit-content">A B</td><td></td></tr></table>
<table border><tr><td style="width: 150px; max-width: -moz-available">A B</td><td></td></tr></table>
</td>

18
layout/reftests/box-properties/width-special-values-float-intrinsic.html
Просмотреть файл

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<title>intrinsic widths for -moz-intrinsic, -moz-min-intrinsic, -moz-shrink-wrap, and -moz-fill values of CSS width property, on blocks</title>
<title>intrinsic widths for -moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css">
@ -13,35 +13,35 @@
<body>
<table border><tr><td>
<div style="width: -moz-intrinsic">AA B</div>
<div style="width: -moz-max-content">AA B</div>
</td></tr></table>
<table border width="1"><tr><td>
<div style="width: -moz-intrinsic">AA B</div>
<div style="width: -moz-max-content">AA B</div>
</td></tr></table>
<table border><tr><td>
<div style="width: -moz-min-intrinsic">AA B</div>
<div style="width: -moz-min-content">AA B</div>
</td></tr></table>
<table border width="1"><tr><td>
<div style="width: -moz-min-intrinsic">AA B</div>
<div style="width: -moz-min-content">AA B</div>
</td></tr></table>
<table border><tr><td>
<div style="width: -moz-shrink-wrap">AA B</div>
<div style="width: -moz-fit-content">AA B</div>
</td></tr></table>
<table border width="1"><tr><td>
<div style="width: -moz-shrink-wrap">AA B</div>
<div style="width: -moz-fit-content">AA B</div>
</td></tr></table>
<table border><tr><td>
<div style="width: -moz-fill">AA B</div>
<div style="width: -moz-available">AA B</div>
</td></tr></table>
<table border width="1"><tr><td>
<div style="width: -moz-fill">AA B</div>
<div style="width: -moz-available">AA B</div>
</td></tr></table>
</body>

10
layout/reftests/box-properties/width-special-values-float.html
Просмотреть файл

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<title>-moz-intrinsic, -moz-min-intrinsic, -moz-shrink-wrap, and -moz-fill values of CSS width property, on blocks</title>
<title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css">
@ -22,10 +22,10 @@
margin-bottom: 1px;
}
div.v1 { width: -moz-intrinsic; }
div.v2 { width: -moz-min-intrinsic; }
div.v3 { width: -moz-shrink-wrap; }
div.v4 { width: -moz-fill; }
div.v1 { width: -moz-max-content; }
div.v2 { width: -moz-min-content; }
div.v3 { width: -moz-fit-content; }
div.v4 { width: -moz-available; }
div.s1 { -moz-box-sizing: content; }
div.s2 { -moz-box-sizing: padding; }

2
layout/reftests/box-properties/width-special-values-image-block-ref.html
Просмотреть файл

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<title>-moz-intrinsic, -moz-min-intrinsic, -moz-shrink-wrap, and -moz-fill values of CSS width property, on block images</title>
<title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on block images</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css">

10
layout/reftests/box-properties/width-special-values-image-block.html
Просмотреть файл

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<title>-moz-intrinsic, -moz-min-intrinsic, -moz-shrink-wrap, and -moz-fill values of CSS width property, on block images</title>
<title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on block images</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css">
@ -17,10 +17,10 @@
margin-bottom: 1px;
}
img.v1 { width: -moz-intrinsic; }
img.v2 { width: -moz-min-intrinsic; }
img.v3 { width: -moz-shrink-wrap; }
img.v4 { width: -moz-fill; }
img.v1 { width: -moz-max-content; }
img.v2 { width: -moz-min-content; }
img.v3 { width: -moz-fit-content; }
img.v4 { width: -moz-available; }
img.s1 { -moz-box-sizing: content; }
img.s2 { -moz-box-sizing: padding; }

2
layout/reftests/box-properties/width-special-values-image-ref.html
Просмотреть файл

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<title>-moz-intrinsic, -moz-min-intrinsic, -moz-shrink-wrap, and -moz-fill values of CSS width property, on inline images</title>
<title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on inline images</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css">

10
layout/reftests/box-properties/width-special-values-image.html
Просмотреть файл

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<title>-moz-intrinsic, -moz-min-intrinsic, -moz-shrink-wrap, and -moz-fill values of CSS width property, on inline images</title>
<title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on inline images</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css">
@ -16,10 +16,10 @@
margin-bottom: 1px;
}
img.v1 { width: -moz-intrinsic; }
img.v2 { width: -moz-min-intrinsic; }
img.v3 { width: -moz-shrink-wrap; }
img.v4 { width: -moz-fill; }
img.v1 { width: -moz-max-content; }
img.v2 { width: -moz-min-content; }
img.v3 { width: -moz-fit-content; }
img.v4 { width: -moz-available; }
img.s1 { -moz-box-sizing: content; }
img.s2 { -moz-box-sizing: padding; }

8
layout/style/nsCSSKeywordList.h
Просмотреть файл

@ -73,6 +73,7 @@ CSS_KEY(-moz-all, _moz_all)
CSS_KEY(-moz-alt-content, _moz_alt_content)
CSS_KEY(-moz-anchor-decoration, _moz_anchor_decoration)
CSS_KEY(-moz-arabic-indic, _moz_arabic_indic)
CSS_KEY(-moz-available, _moz_available)
CSS_KEY(-moz-bengali, _moz_bengali)
CSS_KEY(-moz-box, _moz_box)
CSS_KEY(-moz-button, _moz_button)
@ -102,7 +103,7 @@ CSS_KEY(-moz-ethiopic-halehame-ti-er, _moz_ethiopic_halehame_ti_er)
CSS_KEY(-moz-ethiopic-halehame-ti-et, _moz_ethiopic_halehame_ti_et)
CSS_KEY(-moz-field, _moz_field)
CSS_KEY(-moz-fieldtext, _moz_fieldtext)
CSS_KEY(-moz-fill, _moz_fill)
CSS_KEY(-moz-fit-content, _moz_fit_content)
CSS_KEY(-moz-grabbing, _moz_grabbing)
CSS_KEY(-moz-grab, _moz_grab)
CSS_KEY(-moz-grid-group, _moz_grid_group)
@ -120,7 +121,6 @@ CSS_KEY(-moz-initial, _moz_initial)
CSS_KEY(-moz-inline-box, _moz_inline_box)
CSS_KEY(-moz-inline-grid, _moz_inline_grid)
CSS_KEY(-moz-inline-stack, _moz_inline_stack)
CSS_KEY(-moz-intrinsic, _moz_intrinsic)
CSS_KEY(-moz-japanese-formal, _moz_japanese_formal)
CSS_KEY(-moz-japanese-informal, _moz_japanese_informal)
CSS_KEY(-moz-kannada, _moz_kannada)
@ -144,11 +144,12 @@ CSS_KEY(-moz-mac-menutextselect, _moz_mac_menutextselect)
CSS_KEY(-moz-mac-secondaryhighlight, _moz_mac_secondaryhighlight)
CSS_KEY(-moz-malayalam, _moz_malayalam)
CSS_KEY(-moz-marker, _moz_marker) // Disabled because not supported correctly.
CSS_KEY(-moz-max-content, _moz_max_content)
CSS_KEY(-moz-menuhover, _moz_menuhover)
CSS_KEY(-moz-menuhovertext, _moz_menuhovertext)
CSS_KEY(-moz-menubarhovertext, _moz_menubarhovertext)
CSS_KEY(-moz-middle-with-baseline, _moz_middle_with_baseline)
CSS_KEY(-moz-min-intrinsic, _moz_min_intrinsic)
CSS_KEY(-moz-min-content, _moz_min_content)
CSS_KEY(-moz-myanmar, _moz_myanmar)
CSS_KEY(-moz-none, _moz_none)
CSS_KEY(-moz-oriya, _moz_oriya)
@ -162,7 +163,6 @@ CSS_KEY(-moz-scrollbars-horizontal, _moz_scrollbars_horizontal)
CSS_KEY(-moz-scrollbars-none, _moz_scrollbars_none)
CSS_KEY(-moz-scrollbars-vertical, _moz_scrollbars_vertical)
CSS_KEY(-moz-show-background, _moz_show_background)
CSS_KEY(-moz-shrink-wrap, _moz_shrink_wrap)
CSS_KEY(-moz-simp-chinese-formal, _moz_simp_chinese_formal)
CSS_KEY(-moz-simp-chinese-informal, _moz_simp_chinese_informal)
CSS_KEY(-moz-spinning, _moz_spinning)

8
layout/style/nsCSSProps.cpp
Просмотреть файл

@ -955,10 +955,10 @@ const PRInt32 nsCSSProps::kWhitespaceKTable[] = {
};
const PRInt32 nsCSSProps::kWidthKTable[] = {
eCSSKeyword__moz_intrinsic, NS_STYLE_WIDTH_INTRINSIC,
eCSSKeyword__moz_min_intrinsic, NS_STYLE_WIDTH_MIN_INTRINSIC,
eCSSKeyword__moz_shrink_wrap, NS_STYLE_WIDTH_SHRINK_WRAP,
eCSSKeyword__moz_fill, NS_STYLE_WIDTH_FILL,
eCSSKeyword__moz_max_content, NS_STYLE_WIDTH_MAX_CONTENT,
eCSSKeyword__moz_min_content, NS_STYLE_WIDTH_MIN_CONTENT,
eCSSKeyword__moz_fit_content, NS_STYLE_WIDTH_FIT_CONTENT,
eCSSKeyword__moz_available, NS_STYLE_WIDTH_AVAILABLE,
eCSSKeyword_UNKNOWN,-1
};

12
layout/style/test/property_database.js
Просмотреть файл

@ -956,7 +956,7 @@ var gCSSProperties = {
initial_values: [ " auto" ],
/* XXX these have prerequisites */
other_values: [ "15px", "3em", "15%" ],
invalid_values: [ "none", "-moz-intrinsic", "-moz-min-intrinsic", "-moz-shrink-wrap", "-moz-fill" ]
invalid_values: [ "none", "-moz-max-content", "-moz-min-content", "-moz-fit-content", "-moz-available" ]
},
"ime-mode": {
domProp: "imeMode",
@ -1104,14 +1104,14 @@ var gCSSProperties = {
type: CSS_TYPE_LONGHAND,
initial_values: [ "none" ],
other_values: [ "30px", "50%", "0" ],
invalid_values: [ "auto", "-moz-intrinsic", "-moz-min-intrinsic", "-moz-shrink-wrap", "-moz-fill" ]
invalid_values: [ "auto", "-moz-max-content", "-moz-min-content", "-moz-fit-content", "-moz-available" ]
},
"max-width": {
domProp: "maxWidth",
inherited: false,
type: CSS_TYPE_LONGHAND,
initial_values: [ "none" ],
other_values: [ "30px", "50%", "0", "-moz-intrinsic", "-moz-min-intrinsic", "-moz-shrink-wrap", "-moz-fill" ],
other_values: [ "30px", "50%", "0", "-moz-max-content", "-moz-min-content", "-moz-fit-content", "-moz-available" ],
invalid_values: [ "auto" ]
},
"min-height": {
@ -1120,14 +1120,14 @@ var gCSSProperties = {
type: CSS_TYPE_LONGHAND,
initial_values: [ "0" ],
other_values: [ "30px", "50%" ],
invalid_values: [ "auto", "none", "-moz-intrinsic", "-moz-min-intrinsic", "-moz-shrink-wrap", "-moz-fill" ]
invalid_values: [ "auto", "none", "-moz-max-content", "-moz-min-content", "-moz-fit-content", "-moz-available" ]
},
"min-width": {
domProp: "minWidth",
inherited: false,
type: CSS_TYPE_LONGHAND,
initial_values: [ "0" ],
other_values: [ "30px", "50%", "-moz-intrinsic", "-moz-min-intrinsic", "-moz-shrink-wrap", "-moz-fill" ],
other_values: [ "30px", "50%", "-moz-max-content", "-moz-min-content", "-moz-fit-content", "-moz-available" ],
invalid_values: [ "auto", "none" ]
},
"opacity": {
@ -1586,7 +1586,7 @@ var gCSSProperties = {
type: CSS_TYPE_LONGHAND,
initial_values: [ " auto" ],
/* XXX these have prerequisites */
other_values: [ "15px", "3em", "15%", "-moz-intrinsic", "-moz-min-intrinsic", "-moz-shrink-wrap", "-moz-fill" ],
other_values: [ "15px", "3em", "15%", "-moz-max-content", "-moz-min-content", "-moz-fit-content", "-moz-available" ],
invalid_values: [ "none" ]
},
"word-spacing": {

28
layout/tables/BasicTableLayoutStrategy.cpp
Просмотреть файл

@ -142,15 +142,15 @@ GetWidthInfo(nsIRenderingContext *aRenderingContext,
prefPercent = aStylePos->mWidth.GetPercentValue();
} else if (unit == eStyleUnit_Enumerated && aIsCell) {
switch (aStylePos->mWidth.GetIntValue()) {
case NS_STYLE_WIDTH_INTRINSIC:
case NS_STYLE_WIDTH_MAX_CONTENT:
// 'width' only affects pref width, not min
// width, so don't change anything
break;
case NS_STYLE_WIDTH_MIN_INTRINSIC:
case NS_STYLE_WIDTH_MIN_CONTENT:
prefCoord = minCoord;
break;
case NS_STYLE_WIDTH_SHRINK_WRAP:
case NS_STYLE_WIDTH_FILL:
case NS_STYLE_WIDTH_FIT_CONTENT:
case NS_STYLE_WIDTH_AVAILABLE:
// act just like 'width: auto'
break;
default:
@ -160,12 +160,12 @@ GetWidthInfo(nsIRenderingContext *aRenderingContext,
nsStyleCoord maxWidth(aStylePos->mMaxWidth);
if (maxWidth.GetUnit() == eStyleUnit_Enumerated) {
if (!aIsCell || maxWidth.GetIntValue() == NS_STYLE_WIDTH_FILL)
if (!aIsCell || maxWidth.GetIntValue() == NS_STYLE_WIDTH_AVAILABLE)
maxWidth.SetNoneValue();
else if (maxWidth.GetIntValue() == NS_STYLE_WIDTH_SHRINK_WRAP)
// for 'max-width', '-moz-shrink-wrap' is like
// '-moz-intrinsic'
maxWidth.SetIntValue(NS_STYLE_WIDTH_INTRINSIC,
else if (maxWidth.GetIntValue() == NS_STYLE_WIDTH_FIT_CONTENT)
// for 'max-width', '-moz-fit-content' is like
// '-moz-max-content'
maxWidth.SetIntValue(NS_STYLE_WIDTH_MAX_CONTENT,
eStyleUnit_Enumerated);
}
unit = maxWidth.GetUnit();
@ -188,12 +188,12 @@ GetWidthInfo(nsIRenderingContext *aRenderingContext,
nsStyleCoord minWidth(aStylePos->mMinWidth);
if (minWidth.GetUnit() == eStyleUnit_Enumerated) {
if (!aIsCell || minWidth.GetIntValue() == NS_STYLE_WIDTH_FILL)
if (!aIsCell || minWidth.GetIntValue() == NS_STYLE_WIDTH_AVAILABLE)
minWidth.SetCoordValue(0);
else if (minWidth.GetIntValue() == NS_STYLE_WIDTH_SHRINK_WRAP)
// for 'min-width', '-moz-shrink-wrap' is like
// '-moz-min-intrinsic'
minWidth.SetIntValue(NS_STYLE_WIDTH_MIN_INTRINSIC,
else if (minWidth.GetIntValue() == NS_STYLE_WIDTH_FIT_CONTENT)
// for 'min-width', '-moz-fit-content' is like
// '-moz-min-content'
minWidth.SetIntValue(NS_STYLE_WIDTH_MIN_CONTENT,
eStyleUnit_Enumerated);
}
unit = minWidth.GetUnit();

12
layout/tables/FixedTableLayoutStrategy.cpp
Просмотреть файл

@ -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) {

6
layout/tables/nsTableFrame.cpp
Просмотреть файл

@ -3485,7 +3485,7 @@ nsTableFrame::IsAutoWidth(PRBool* aIsPctWidth)
// seems silly.
*aIsPctWidth = width.GetUnit() == eStyleUnit_Percent &&
width.GetPercentValue() > 0.0f;
// Should this handle -moz-fill and -moz-shrink-wrap?
// Should this handle -moz-available and -moz-fit-content?
}
return width.GetUnit() == eStyleUnit_Auto;
}
@ -3534,13 +3534,13 @@ nsTableFrame::IsAutoLayout()
if (GetStyleTable()->mLayoutStrategy == NS_STYLE_TABLE_LAYOUT_AUTO)
return PR_TRUE;
// a fixed-layout inline-table must have a width
// and tables with 'width: -moz-intrinsic' must be auto-layout
// and tables with 'width: -moz-max-content' must be auto-layout
// (at least as long as FixedTableLayoutStrategy::GetPrefWidth returns
// nscoord_MAX)
const nsStyleCoord &width = GetStylePosition()->mWidth;
return (width.GetUnit() == eStyleUnit_Auto) ||
(width.GetUnit() == eStyleUnit_Enumerated &&
width.GetIntValue() == NS_STYLE_WIDTH_INTRINSIC);
width.GetIntValue() == NS_STYLE_WIDTH_MAX_CONTENT);
}
#ifdef DEBUG