mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Backout changeset 986091dac358 (bug 744234) for M4 oranges.
This commit is contained in:
parent
e1f0a7a476
commit
4178f3e8ca
@ -6739,11 +6739,11 @@ CSSParserImpl::ParseBorderImage()
|
||||
{
|
||||
nsAutoParseCompoundProperty compound(this);
|
||||
|
||||
// border-image: inherit | -moz-initial |
|
||||
// border-image: inherit |
|
||||
// <border-image-source> ||
|
||||
// <border-image-slice>
|
||||
// [ / <border-image-width> |
|
||||
// / <border-image-width>? / <border-image-outset> ]? ||
|
||||
// [ / <border-image-width>?
|
||||
// [ / <border-image-outset>]?]? ||
|
||||
// <border-image-repeat>
|
||||
|
||||
nsCSSValue value;
|
||||
@ -6753,7 +6753,7 @@ CSSParserImpl::ParseBorderImage()
|
||||
AppendValue(eCSSProperty_border_image_width, value);
|
||||
AppendValue(eCSSProperty_border_image_outset, value);
|
||||
AppendValue(eCSSProperty_border_image_repeat, value);
|
||||
// Keyword "inherit" (and "-moz-initial") can't be mixed, so we are done.
|
||||
// Keyword "inherit" can't be mixed, so we are done.
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -6792,17 +6792,13 @@ CSSParserImpl::ParseBorderImage()
|
||||
|
||||
// [ / <border-image-width>?
|
||||
if (ExpectSymbol('/', true)) {
|
||||
bool foundBorderImageWidth = ParseBorderImageWidth(false);
|
||||
ParseBorderImageWidth(false);
|
||||
|
||||
// [ / <border-image-outset>
|
||||
if (ExpectSymbol('/', true)) {
|
||||
if (!ParseBorderImageOutset(false)) {
|
||||
return false;
|
||||
}
|
||||
} else if (!foundBorderImageWidth) {
|
||||
// If this part has an trailing slash, the whole declaration is
|
||||
// invalid.
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -259,12 +259,7 @@ var gCSSProperties = {
|
||||
"url('border.png') fill repeat",
|
||||
"fill repeat",
|
||||
"url('border.png') fill / 1em",
|
||||
"url('border.png') / repeat",
|
||||
"url('border.png') 1 /",
|
||||
"url('border.png') 1 / /",
|
||||
"1 / url('border.png')",
|
||||
"url('border.png') / 1",
|
||||
"url('border.png') / / 1"]
|
||||
"url('border.png') / repeat" ]
|
||||
},
|
||||
"-moz-border-image-source": {
|
||||
domProp: "MozBorderImageSource",
|
||||
|
Loading…
Reference in New Issue
Block a user