aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-06-15 23:51:16 -0700
committerGitHub <noreply@github.com>2017-06-15 23:51:16 -0700
commit32f82959f89ccd0d6f92058f22f11f2cc7d21d52 (patch)
treeb20d845c0847fc404e368f854e998f259eef8569
parent4d54f2c9bbc700f06cfef7d85df5f43bdbcf085d (diff)
parent38a0824ccd95c96d5447eb112a6d67fc753830e5 (diff)
downloadservo-32f82959f89ccd0d6f92058f22f11f2cc7d21d52.tar.gz
servo-32f82959f89ccd0d6f92058f22f11f2cc7d21d52.zip
Auto merge of #17353 - upsuper:counter-style-disc, r=dbaron
Make counter style 'disc' not overridable This is the Servo side change for [bug 1372488](https://bugzilla.mozilla.org/show_bug.cgi?id=1372488). <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17353) <!-- Reviewable:end -->
-rw-r--r--components/style/stylesheets/rule_parser.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/style/stylesheets/rule_parser.rs b/components/style/stylesheets/rule_parser.rs
index 0cecb8bf36a..e454b529c59 100644
--- a/components/style/stylesheets/rule_parser.rs
+++ b/components/style/stylesheets/rule_parser.rs
@@ -365,10 +365,10 @@ impl<'a, 'b, 'i> AtRuleParser<'i> for NestedRuleParser<'a, 'b> {
return Err(StyleParseError::UnsupportedAtRule(name.clone()).into())
}
let name = parse_counter_style_name(input)?;
- // ASCII-case-insensitive matches for "decimal" are already
- // lower-cased by `parse_counter_style_name`, so we can use ==
- // here.
- if name.0 == atom!("decimal") {
+ // ASCII-case-insensitive matches for "decimal" and "disc".
+ // The name is already lower-cased by `parse_counter_style_name`
+ // so we can use == here.
+ if name.0 == atom!("decimal") || name.0 == atom!("disc") {
return Err(StyleParseError::UnspecifiedError.into())
}
Ok(AtRuleType::WithBlock(AtRulePrelude::CounterStyle(name)))