Bug 807184 patch 2: Remove support for prefixed -moz-initial (in favor of unprefixed initial). r=dholbert

This commit is contained in:
L. David Baron 2013-06-20 18:31:27 -07:00
parent d34aaed0bf
commit 410072b2b2
2 changed files with 2 additions and 7 deletions

View File

@ -90,7 +90,6 @@ CSS_KEY(-moz-html-cellhighlight, _moz_html_cellhighlight)
CSS_KEY(-moz-html-cellhighlighttext, _moz_html_cellhighlighttext)
CSS_KEY(-moz-image-rect, _moz_image_rect)
CSS_KEY(-moz-info, _moz_info)
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)

View File

@ -5169,8 +5169,7 @@ CSSParserImpl::ParseVariant(nsCSSValue& aValue,
aValue.SetInheritValue();
return true;
}
else if (eCSSKeyword__moz_initial == keyword ||
eCSSKeyword_initial == keyword) { // anything that can inherit can also take an initial val.
else if (eCSSKeyword_initial == keyword) { // anything that can inherit can also take an initial val.
aValue.SetInitialValue();
return true;
}
@ -6956,7 +6955,6 @@ CSSParserImpl::ParseBackgroundItem(CSSParserImpl::BackgroundParseState& aState)
nsCSSKeyword keyword = nsCSSKeywords::LookupKeyword(mToken.mIdent);
int32_t dummy;
if (keyword == eCSSKeyword_inherit ||
keyword == eCSSKeyword__moz_initial ||
keyword == eCSSKeyword_initial) {
return false;
} else if (keyword == eCSSKeyword_none) {
@ -8353,7 +8351,6 @@ CSSParserImpl::ParseRect(nsCSSProperty aPropID)
val.SetInheritValue();
break;
case eCSSKeyword_initial:
case eCSSKeyword__moz_initial:
if (!ExpectEndProperty()) {
return false;
}
@ -9064,7 +9061,7 @@ CSSParserImpl::ParseFamily(nsCSSValue& aValue)
if (keyword == eCSSKeyword_default) {
return false;
}
if (keyword == eCSSKeyword__moz_initial || keyword == eCSSKeyword_initial) {
if (keyword == eCSSKeyword_initial) {
aValue.SetInitialValue();
return true;
}
@ -9093,7 +9090,6 @@ CSSParserImpl::ParseFamily(nsCSSValue& aValue)
case eCSSKeyword_inherit:
case eCSSKeyword_initial:
case eCSSKeyword_default:
case eCSSKeyword__moz_initial:
case eCSSKeyword__moz_use_system_font:
return false;
default: