Rename -moz-background-size to background-size. (Bug 549809) r=roc

This commit is contained in:
L. David Baron 2010-06-08 18:44:33 -07:00
Родитель 7a021d9262
Коммит 534169bd6e
74 изменённых файлов: 96 добавлений и 96 удалений

Просмотреть файл

@ -972,7 +972,7 @@ richlistitem[type="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-i
background: -moz-linear-gradient(left, transparent, transparent 1px,
rgba(50%,50%,50%,.1) 1px, rgba(50%,50%,50%,.1));
background-position: -6px 0;
-moz-background-size: 200%;
background-size: 200%;
margin: 0;
padding: 0;
-moz-border-image: url(tabbrowser/tab.png) 3 5 3 6 / 3px 5px 3px 6px;

Просмотреть файл

@ -258,7 +258,7 @@ interface nsIDOMNSCSS2Properties : nsIDOMSVGCSS2Properties
attribute DOMString MozWindowShadow;
// raises(DOMException) on setting
attribute DOMString MozBackgroundSize;
attribute DOMString backgroundSize;
// raises(DOMException) on setting
attribute DOMString MozTransitionProperty;

Просмотреть файл

@ -2332,7 +2332,7 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
* background-position
* background-clip
* background-origin
* background-size (-moz-background-size)
* background-size
* background-break (-moz-background-inline-policy)
*
* (background-color applies to the entire element and not to individual

Просмотреть файл

@ -10,7 +10,7 @@
height: 128px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: auto auto;
background-size: auto auto;
}
</style>
</head>

Просмотреть файл

@ -15,7 +15,7 @@
height: 128px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: auto 16px;
background-size: auto 16px;
}
</style>
</head>

Просмотреть файл

@ -15,7 +15,7 @@
height: 128px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: auto 12.5%;
background-size: auto 12.5%;
}
</style>
</head>

Просмотреть файл

@ -10,7 +10,7 @@
height: 128px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: auto;
background-size: auto;
}
</style>
</head>

Просмотреть файл

@ -8,7 +8,7 @@ body
background-image: url(aqua-32x32.png);
background-attachment: fixed;
background-repeat: no-repeat;
-moz-background-size: contain;
background-size: contain;
}
</style>
</head>

Просмотреть файл

@ -8,7 +8,7 @@ body
background-image: url(aqua-32x32.png);
background-attachment: scroll;
background-repeat: no-repeat;
-moz-background-size: contain;
background-size: contain;
}
</style>
</head>

Просмотреть файл

@ -7,7 +7,7 @@ body
{
background-image: url(aqua-32x32.png);
background-attachment: fixed;
-moz-background-size: contain;
background-size: contain;
}
</style>
</head>

Просмотреть файл

@ -8,7 +8,7 @@ body
background-image: url(aqua-32x32.png);
background-attachment: fixed;
background-repeat: no-repeat;
-moz-background-size: cover;
background-size: cover;
}
</style>
</head>

Просмотреть файл

@ -8,7 +8,7 @@ body
background-image: url(aqua-32x32.png);
background-attachment: scroll;
background-repeat: no-repeat;
-moz-background-size: cover;
background-size: cover;
}
</style>
</head>

Просмотреть файл

@ -7,7 +7,7 @@ body
{
background-image: url(aqua-32x32.png);
background-attachment: fixed;
-moz-background-size: cover;
background-size: cover;
}
</style>
</head>

Просмотреть файл

@ -7,7 +7,7 @@ body
{
background-image: url(aqua-32x32.png);
background-attachment: fixed;
-moz-background-size: 100% 100%;
background-size: 100% 100%;
background-repeat: no-repeat;
}
</style>

Просмотреть файл

@ -7,7 +7,7 @@ body
{
background-image: url(aqua-32x32.png);
background-attachment: scroll;
-moz-background-size: 100% 100%;
background-size: 100% 100%;
}
</style>
</head>

Просмотреть файл

@ -22,7 +22,7 @@ body
*/
height: 10000px;
-moz-background-size: 100% 100%;
background-size: 100% 100%;
}
</style>
</head>

Просмотреть файл

@ -7,7 +7,7 @@ body
{
background-image: url(aqua-32x32.png);
background-attachment: fixed;
-moz-background-size: 100% 100%;
background-size: 100% 100%;
}
</style>
</head>

Просмотреть файл

@ -16,7 +16,7 @@
height: 88px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: contain;
background-size: contain;
background-clip: border-box;
}
</style>

Просмотреть файл

@ -18,7 +18,7 @@
background-image: url(aqua-32x32.png);
background-color: lime;
background-repeat: no-repeat;
-moz-background-size: contain;
background-size: contain;
background-clip: padding-box;
background-origin: border-box;
}

Просмотреть файл

@ -16,7 +16,7 @@
height: 88px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: contain;
background-size: contain;
background-clip: padding-box;
background-origin: border-box;
}

Просмотреть файл

@ -16,7 +16,7 @@
height: 88px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: contain;
background-size: contain;
background-clip: padding-box;
}
</style>

Просмотреть файл

@ -15,7 +15,7 @@
height: 128px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: contain;
background-size: contain;
background-position: 50% 50%;
}
</style>

Просмотреть файл

@ -15,7 +15,7 @@
height: 128px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: contain;
background-size: contain;
}
</style>
</head>

Просмотреть файл

@ -21,7 +21,7 @@
white-space: pre;
background-image: url(blue-8x20-green-8x20.png);
background-repeat: no-repeat;
-moz-background-size: cover;
background-size: cover;
-moz-background-inline-policy: bounding-box;
}
</style>

Просмотреть файл

@ -21,7 +21,7 @@
white-space: pre;
background-image: url(blue-8x20-green-8x20.png);
background-repeat: no-repeat;
-moz-background-size: cover;
background-size: cover;
-moz-background-inline-policy: continuous;
}
</style>

Просмотреть файл

@ -21,7 +21,7 @@
white-space: pre;
background-image: url(blue-8x20-green-8x20.png);
background-repeat: no-repeat;
-moz-background-size: cover;
background-size: cover;
-moz-background-inline-policy: each-box;
}
</style>

Просмотреть файл

@ -10,7 +10,7 @@
height: 128px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: cover;
background-size: cover;
}
</style>
</head>

Просмотреть файл

@ -15,7 +15,7 @@
height: 128px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: 16px auto;
background-size: 16px auto;
}
</style>
</head>

Просмотреть файл

@ -15,7 +15,7 @@
height: 128px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: 32px 64px;
background-size: 32px 64px;
}
</style>
</head>

Просмотреть файл

@ -15,7 +15,7 @@
height: 128px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: 16px 25%;
background-size: 16px 25%;
}
</style>
</head>

Просмотреть файл

@ -15,7 +15,7 @@
height: 128px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: 16px;
background-size: 16px;
}
</style>
</head>

Просмотреть файл

@ -6,7 +6,7 @@
body
{
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-moz-background-size: 2147483640ch;
background-size: 2147483640ch;
}
</style>
</head>

Просмотреть файл

@ -6,7 +6,7 @@
body
{
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-moz-background-size: 2147483640cm;
background-size: 2147483640cm;
}
</style>
</head>

Просмотреть файл

@ -6,7 +6,7 @@
body
{
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-moz-background-size: 2147483640em;
background-size: 2147483640em;
}
</style>
</head>

Просмотреть файл

@ -6,7 +6,7 @@
body
{
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-moz-background-size: 2147483640ex;
background-size: 2147483640ex;
}
</style>
</head>

Просмотреть файл

@ -6,7 +6,7 @@
body
{
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-moz-background-size: 2147483640in;
background-size: 2147483640in;
}
</style>
</head>

Просмотреть файл

@ -6,7 +6,7 @@
body
{
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-moz-background-size: 2147483640mm;
background-size: 2147483640mm;
}
</style>
</head>

Просмотреть файл

@ -6,7 +6,7 @@
body
{
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-moz-background-size: 2147483640pc;
background-size: 2147483640pc;
}
</style>
</head>

Просмотреть файл

@ -6,7 +6,7 @@
body
{
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-moz-background-size: 2147483640pt;
background-size: 2147483640pt;
}
</style>
</head>

Просмотреть файл

@ -6,7 +6,7 @@
body
{
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-moz-background-size: 2147483640px;
background-size: 2147483640px;
}
</style>
</head>

Просмотреть файл

@ -6,7 +6,7 @@
body
{
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-moz-background-size: 2147483640rem;
background-size: 2147483640rem;
}
</style>
</head>

Просмотреть файл

@ -15,7 +15,7 @@
height: 128px;
background-image: url(no-intrinsic-size.svg);
background-repeat: no-repeat;
-moz-background-size: 32px auto;
background-size: 32px auto;
}
</style>
</head>

Просмотреть файл

@ -15,7 +15,7 @@
height: 128px;
background-image: url(no-intrinsic-size.svg);
background-repeat: no-repeat;
-moz-background-size: auto 32px;
background-size: auto 32px;
}
</style>
</head>

Просмотреть файл

@ -15,7 +15,7 @@
height: 128px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: 25% auto;
background-size: 25% auto;
}
</style>
</head>

Просмотреть файл

@ -15,7 +15,7 @@
height: 128px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: 25% 32px;
background-size: 25% 32px;
}
</style>
</head>

Просмотреть файл

@ -15,7 +15,7 @@
height: 120px;
background-image: url(blue-8x20-green-16x20.png);
background-repeat: no-repeat;
-moz-background-size: 100% 100%;
background-size: 100% 100%;
}
#innermost
{

Просмотреть файл

@ -15,7 +15,7 @@
height: 128px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: 50% 25%;
background-size: 50% 25%;
}
</style>
</head>

Просмотреть файл

@ -15,7 +15,7 @@
height: 128px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: 25%;
background-size: 25%;
}
</style>
</head>

Просмотреть файл

@ -25,7 +25,7 @@ body
height: 128px;
background-image: url(aqua-32x32.png);
background-repeat: no-repeat;
-moz-background-size: 25%;
background-size: 25%;
}
</style>
</head>

Просмотреть файл

@ -27,7 +27,7 @@ body
height: 160px;
background-image: url(blue-16x20-green-16x20.png);
background-repeat: repeat;
-moz-background-size: 64px 40px;
background-size: 64px 40px;
}
/* Aargh, sampling artifacts, we hates them, precioussss. */

Просмотреть файл

@ -5,7 +5,7 @@
div {
width: 260px;
height: 260px;
-moz-background-size: 100px;
background-size: 100px;
background-size: 100px;
background-position: -20px -20px;
background-image: -moz-linear-gradient(left top, yellow, blue);

Просмотреть файл

@ -4,7 +4,7 @@
html {
background-image: -moz-linear-gradient(black, white 20%);
background-repeat: repeat-x;
-moz-background-size: 1px 400px;
background-size: 1px 400px;
}
body {
font-size: 1em;

Просмотреть файл

@ -4,7 +4,7 @@
html {
background-image: -moz-linear-gradient(black, white 20%);
background-repeat: repeat-x;
-moz-background-size: 1px 400px;
background-size: 1px 400px;
}
body {
font-size: 1em;

Просмотреть файл

@ -4,7 +4,7 @@
html {
background-image: -moz-linear-gradient(black, white 20%);
background-repeat: repeat-x;
-moz-background-size: 1px 80%;
background-size: 1px 80%;
}
body {
font-size: 1em;

Просмотреть файл

@ -4,7 +4,7 @@
html {
background-image: -moz-linear-gradient(black, white 20%);
background-repeat: repeat-x;
-moz-background-size: 1px 80%;
background-size: 1px 80%;
}
body {
font-size: 1em;

Просмотреть файл

@ -1,2 +1,2 @@
<div style="background: -moz-linear-gradient(black, black 50%, white 50%, white);
-moz-background-size: 100px 100px; width: 300px; height: 300px;"></div>
background-size: 100px 100px; width: 300px; height: 300px;"></div>

Просмотреть файл

@ -1,2 +1,2 @@
<div style="background: -moz-linear-gradient(black, black 50px, white 50px, white 100px, black 100px, black 150px, white 150px, white 200px);
-moz-background-size: 100px 200px; width: 300px; height: 300px;"></div>
background-size: 100px 200px; width: 300px; height: 300px;"></div>

Просмотреть файл

@ -1,4 +1,4 @@
<div style="background: -moz-linear-gradient(white, white 50%, black 50%, black);
-moz-background-size: 100px 100px;
background-size: 100px 100px;
background-position: 0 -50px;
width: 300px; height: 300px;"></div>

Просмотреть файл

@ -1,3 +1,3 @@
<div style="background: -moz-linear-gradient(white, white 50px, black 50px, black 100px, white 100px, white 150px, black 150px, black 200px);
-moz-background-size: 100px 200px; background-position: 0 -50px;
background-size: 100px 200px; background-position: 0 -50px;
width: 300px; height: 300px;"></div>

Просмотреть файл

@ -1,3 +1,3 @@
<div style="background: -moz-linear-gradient(black, black 50%, white 50%, white);
-moz-background-size: 300px 100px; background-repeat: repeat-y;
background-size: 300px 100px; background-repeat: repeat-y;
width: 500px; height: 300px;"></div>

Просмотреть файл

@ -1,5 +1,5 @@
<div style="background: -moz-linear-gradient(black, black 50px, white 50px, white 100px, black 100px, black 150px, white 150px, white 200px);
-moz-background-size: 100px 200px; background-repeat: repeat-x;
background-size: 100px 200px; background-repeat: repeat-x;
width: 300px; height: 800px;
margin-bottom: -600px;"></div>
<!-- making the gradient actually be 300px high isn't reliable since

Просмотреть файл

@ -1,5 +1,5 @@
<div style="background: -moz-linear-gradient(black, black 50px, white 50px, white 100px, black 100px, black 150px, white 150px, white 200px);
-moz-background-size: 300px 200px; background-repeat: no-repeat;
background-size: 300px 200px; background-repeat: no-repeat;
width: 800px; height: 800px;
margin-bottom: -600px;"></div>
<!-- making the gradient actually be 300px high isn't reliable since

Просмотреть файл

@ -1,2 +1,2 @@
<div style="background: -moz-linear-gradient(white, black);
-moz-background-size: 300px 100px; width: 300px; height: 300px;"></div>
background-size: 300px 100px; width: 300px; height: 300px;"></div>

Просмотреть файл

@ -1,2 +1,2 @@
<div style="background: -moz-radial-gradient(white, black);
-moz-background-size: 300px 100px; width: 300px; height: 300px;"></div>
background-size: 300px 100px; width: 300px; height: 300px;"></div>

Просмотреть файл

@ -40,7 +40,7 @@
}
/* tests with background-size */
#test5 {
-moz-background-size: 100% 100%;
background-size: 100% 100%;
background-image: -moz-image-rect(url(green-16x16-in-blue-32x32.png), 8, 24, 24, 8);
background-repeat: no-repeat;
}

Просмотреть файл

@ -172,14 +172,14 @@ nsCSSDeclaration::AppendStorageToString(nsCSSProperty aProperty,
aProperty == eCSSProperty__moz_transform_origin) &&
pair->mXValue.GetUnit() != eCSSUnit_Inherit &&
pair->mXValue.GetUnit() != eCSSUnit_Initial) ||
(aProperty == eCSSProperty__moz_background_size &&
(aProperty == eCSSProperty_background_size &&
pair->mXValue.GetUnit() != eCSSUnit_Inherit &&
pair->mXValue.GetUnit() != eCSSUnit_Initial &&
pair->mXValue.GetUnit() != eCSSUnit_Enumerated)) {
// Only output a Y value if it's different from the X value,
// or if it's a background-position value other than 'initial'
// or 'inherit', or if it's a -moz-transform-origin value other
// than 'initial' or 'inherit', or if it's a -moz-background-size
// than 'initial' or 'inherit', or if it's a background-size
// value other than 'initial' or 'inherit' or 'contain' or 'cover'.
aResult.Append(PRUnichar(' '));
AppendCSSValueToString(aProperty, pair->mYValue, aResult);
@ -977,7 +977,7 @@ nsCSSDeclaration::GetValue(nsCSSProperty aProperty,
const nsCSSValueList *origin =
* data->ValueListStorageFor(eCSSProperty_background_origin);
const nsCSSValuePairList *size =
* data->ValuePairListStorageFor(eCSSProperty__moz_background_size);
* data->ValuePairListStorageFor(eCSSProperty_background_size);
for (;;) {
if (size->mXValue.GetUnit() != eCSSUnit_Auto ||
size->mYValue.GetUnit() != eCSSUnit_Auto) {

Просмотреть файл

@ -5368,7 +5368,7 @@ CSSParserImpl::ParseProperty(nsCSSProperty aPropID)
case eCSSProperty_background_origin:
case eCSSProperty_background_repeat:
return ParseBackgroundList(aPropID);
case eCSSProperty__moz_background_size:
case eCSSProperty_background_size:
return ParseBackgroundSize();
case eCSSProperty_border:
return ParseBorderSide(kBorderTopIDs, PR_TRUE);
@ -5659,7 +5659,7 @@ CSSParserImpl::ParseSingleValueProperty(nsCSSValue& aValue,
case eCSSProperty_border_start:
case eCSSProperty_border_top:
case eCSSProperty_border_width:
case eCSSProperty__moz_background_size:
case eCSSProperty_background_size:
case eCSSProperty__moz_border_radius:
case eCSSProperty__moz_border_radius_topLeft:
case eCSSProperty__moz_border_radius_topRight:
@ -6396,7 +6396,7 @@ CSSParserImpl::ParseBackground()
mTempData.SetPropertyBit(eCSSProperty_background_position);
mTempData.SetPropertyBit(eCSSProperty_background_clip);
mTempData.SetPropertyBit(eCSSProperty_background_origin);
mTempData.SetPropertyBit(eCSSProperty__moz_background_size);
mTempData.SetPropertyBit(eCSSProperty_background_size);
return PR_TRUE;
}
delete positionHead;
@ -6759,7 +6759,7 @@ CSSParserImpl::ParseBackgroundSize()
head->mXValue = valuePair.mXValue;
head->mYValue.Reset();
mTempData.mColor.mBackSize = head;
mTempData.SetPropertyBit(eCSSProperty__moz_background_size);
mTempData.SetPropertyBit(eCSSProperty_background_size);
return ExpectEndProperty();
}
@ -6783,7 +6783,7 @@ CSSParserImpl::ParseBackgroundSize()
break;
}
mTempData.mColor.mBackSize = head;
mTempData.SetPropertyBit(eCSSProperty__moz_background_size);
mTempData.SetPropertyBit(eCSSProperty_background_size);
return PR_TRUE;
}
delete head;
@ -6791,7 +6791,7 @@ CSSParserImpl::ParseBackgroundSize()
}
/**
* Parses two values that correspond to lengths for the -moz-background-size
* Parses two values that correspond to lengths for the background-size
* property. These can be one or two lengths (or the 'auto' keyword) or
* percentages corresponding to the element's dimensions or the single keywords
* 'contain' or 'cover'. 'initial' and 'inherit' must be handled by the caller

Просмотреть файл

@ -535,9 +535,9 @@ CSS_PROP_BACKGROUND(
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_BACKGROUND(
-moz-background-size,
_moz_background_size,
MozBackgroundSize,
background-size,
background_size,
BackgroundSize,
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE |
CSS_PROPERTY_VALUE_LIST_USES_COMMAS,
Color,

Просмотреть файл

@ -1581,7 +1581,7 @@ static const nsCSSProperty gBackgroundSubpropTable[] = {
eCSSProperty_background_position,
eCSSProperty_background_clip,
eCSSProperty_background_origin,
eCSSProperty__moz_background_size,
eCSSProperty_background_size,
eCSSProperty_UNKNOWN
};

Просмотреть файл

@ -4672,7 +4672,7 @@ nsComputedDOMStyle::GetQueryablePropertyMap(PRUint32* aLength)
COMPUTED_STYLE_MAP_ENTRY(background_clip, BackgroundClip),
COMPUTED_STYLE_MAP_ENTRY(_moz_background_inline_policy, BackgroundInlinePolicy),
COMPUTED_STYLE_MAP_ENTRY(background_origin, BackgroundOrigin),
COMPUTED_STYLE_MAP_ENTRY(_moz_background_size, MozBackgroundSize),
COMPUTED_STYLE_MAP_ENTRY(background_size, MozBackgroundSize),
COMPUTED_STYLE_MAP_ENTRY(binding, Binding),
COMPUTED_STYLE_MAP_ENTRY(border_bottom_colors, BorderBottomColors),
COMPUTED_STYLE_MAP_ENTRY(border_image, BorderImage),

Просмотреть файл

@ -1599,7 +1599,7 @@ nsStyleAnimation::ExtractComputedValue(nsCSSProperty aProperty,
break;
}
case eCSSProperty__moz_background_size: {
case eCSSProperty_background_size: {
const nsStyleBackground *bg =
static_cast<const nsStyleBackground*>(styleStruct);
nsCSSValuePairList *result = nsnull;

Просмотреть файл

@ -99,8 +99,8 @@ var gCSSProperties = {
other_values: [ "border-box", "content-box", "border-box, padding-box", "padding-box, padding-box, padding-box", "border-box, border-box" ],
invalid_values: [ "margin-box", "padding-box padding-box" ]
},
"-moz-background-size": {
domProp: "MozBackgroundSize",
"background-size": {
domProp: "backgroundSize",
inherited: false,
type: CSS_TYPE_LONGHAND,
initial_values: [ "auto", "auto auto" ],
@ -788,7 +788,7 @@ var gCSSProperties = {
domProp: "background",
inherited: false,
type: CSS_TYPE_TRUE_SHORTHAND,
subproperties: [ "background-attachment", "background-color", "background-image", "background-position", "background-repeat", "background-clip", "background-origin", "-moz-background-size" ],
subproperties: [ "background-attachment", "background-color", "background-image", "background-position", "background-repeat", "background-clip", "background-origin", "background-size" ],
initial_values: [ "transparent", "none", "repeat", "scroll", "0% 0%", "top left", "left top", "transparent none", "top left none", "left top none", "none left top", "none top left", "none 0% 0%", "transparent none repeat scroll top left", "left top repeat none scroll transparent" ],
other_values: [
/* without multiple backgrounds */

Просмотреть файл

@ -123,11 +123,11 @@ e.setAttribute("style", "background: red; background-clip: content-box");
is(e.style.background, "", "should not have background shorthand (clip:content-box)");
e.setAttribute("style", "background: red; background-clip: content-box; background-origin: content-box;");
isnot(e.style.background, "", "should have background shorthand (clip:content-box;origin:content-box)");
e.setAttribute("style", "background: red; -moz-background-size: 100% 100%");
e.setAttribute("style", "background: red; background-size: 100% 100%");
is(e.style.background, "", "should not have background shorthand (size:100% 100%)");
e.setAttribute("style", "background: red; -moz-background-size: 100% auto");
e.setAttribute("style", "background: red; background-size: 100% auto");
is(e.style.background, "", "should not have background shorthand (size:100% auto)");
e.setAttribute("style", "background: red; -moz-background-size: auto 100%");
e.setAttribute("style", "background: red; background-size: auto 100%");
is(e.style.background, "", "should not have background shorthand (size:auto 100%)");
e.setAttribute("style", "background: red; -moz-background-inline-policy: each-box");
isnot(e.style.background, "", "should have background shorthand (-moz-background-inline-policy not relevant)");
@ -136,22 +136,22 @@ isnot(e.style.background, "", "should have background shorthand (-moz-background
// the subproperties are the same length.
// XXX Should change background-size to cover,auto,contain once
// background-size is part of shorthand.
e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; -moz-background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
isnot(e.style.background, "", "should have background shorthand (all lists length 3)");
e.setAttribute("style", "background-clip: border-box, padding-box, border-box, border-box; background-origin: border-box, padding-box, padding-box; -moz-background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
e.setAttribute("style", "background-clip: border-box, padding-box, border-box, border-box; background-origin: border-box, padding-box, padding-box; background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
is(e.style.background, "", "should not have background shorthand (background-clip too long)");
e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: padding-box, padding-box; -moz-background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: padding-box, padding-box; background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
is(e.style.background, "", "should not have background shorthand (background-origin too short)");
e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; -moz-background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png), none; background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png), none; background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
is(e.style.background, "", "should not have background shorthand (background-image too long)");
e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; -moz-background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
is(e.style.background, "", "should not have background shorthand (background-attachment too short)");
e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; -moz-background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px, bottom; background-repeat: repeat-x, repeat, no-repeat");
e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px, bottom; background-repeat: repeat-x, repeat, no-repeat");
is(e.style.background, "", "should not have background shorthand (background-position too long)");
e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; -moz-background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat");
e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat");
is(e.style.background, "", "should not have background shorthand (background-repeat too short)");
e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; -moz-background-size: auto, auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
is(e.style.background, "", "should not have background shorthand (-moz-background-size too long)");
e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; background-size: auto, auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
is(e.style.background, "", "should not have background shorthand (background-size too long)");
// Check that we only serialize transition when the lists are the same length.
e.setAttribute("style", "-moz-transition-property: color, width; -moz-transition-duration: 1s, 200ms; -moz-transition-timing-function: ease-in, linear; -moz-transition-delay: 0s, 1s");

Просмотреть файл

@ -47,7 +47,6 @@ function any_unit_to_num(str)
}
var supported_properties = {
"-moz-background-size": [ test_background_size_transition ],
"-moz-border-radius-bottomleft": [ test_radius_transition ],
"-moz-border-radius-bottomright": [ test_radius_transition ],
"-moz-border-radius-topleft": [ test_radius_transition ],
@ -70,6 +69,7 @@ var supported_properties = {
test_length_percent_pair_transition ],
"background-color": [ test_color_transition ],
"background-position": [ test_background_position_transition ],
"background-size": [ test_background_size_transition ],
"border-bottom-color": [ test_color_transition,
test_border_color_transition ],
"border-bottom-width": [ test_length_transition ],