Backout changeset 6ff3de859ce3 (bug 804944), which depended on an unlanded patch that I currently have tagged for bug 784461.
authorL. David Baron <dbaron@dbaron.org>
Sun, 10 Mar 2013 12:54:09 -0700
changeset 124335 cc6c725d463de2d2f55114a5fb7394bb1a634adc
parent 124334 9a9689e414e452f7948fdf37445e2d1954811e26
child 124336 14f662af1c91d0673e8b5570e978b9ae9621962d
push id24417
push userryanvm@gmail.com
push dateMon, 11 Mar 2013 23:58:07 +0000
treeherdermozilla-central@7433bc4545c9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs804944, 784461
milestone22.0a1
backs out6ff3de859ce3109659f5738a7625085bcc1be190
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout changeset 6ff3de859ce3 (bug 804944), which depended on an unlanded patch that I currently have tagged for bug 784461.
layout/style/nsCSSParser.cpp
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -1606,18 +1606,17 @@ CSSParserImpl::ParseAtRule(RuleAppendFun
   } else if (mToken.mIdent.LowerCaseEqualsLiteral("font-face")) {
     parseFunc = &CSSParserImpl::ParseFontFaceRule;
     newSection = eCSSSection_General;
 
   } else if (mToken.mIdent.LowerCaseEqualsLiteral("page")) {
     parseFunc = &CSSParserImpl::ParsePageRule;
     newSection = eCSSSection_General;
 
-  } else if ((nsCSSProps::IsEnabled(eCSSPropertyAlias_MozAnimation) &&
-              mToken.mIdent.LowerCaseEqualsLiteral("-moz-keyframes")) ||
+  } else if (mToken.mIdent.LowerCaseEqualsLiteral("-moz-keyframes") ||
              mToken.mIdent.LowerCaseEqualsLiteral("keyframes")) {
     parseFunc = &CSSParserImpl::ParseKeyframesRule;
     newSection = eCSSSection_General;
 
   } else if (mToken.mIdent.LowerCaseEqualsLiteral("supports") &&
              CSSSupportsRule::PrefEnabled()) {
     parseFunc = &CSSParserImpl::ParseSupportsRule;
     newSection = eCSSSection_General;