Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Avoid dropping a parse error on the floor when checking whether a prop is enabled.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-08-28 21:03:34 +02:00
parent 3b11145ef7
commit 8a0a690384
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/style/properties/properties.mako.rs
View file

@ -1073,7 +1073,7 @@ impl PropertyId {
},
None => return Err(()),
};
id.check_allowed_in(alias, context).map_err(|_| ())?;
id.check_allowed_in(alias, context)?;
Ok(id)
}
@ -1156,8 +1156,11 @@ impl PropertyId {
}
}
fn check_allowed_in(&self, alias: Option<AliasId>, context: &PropertyParserContext)
-> Result<(), PropertyDeclarationParseError<'static>> {
fn check_allowed_in(
&self,
alias: Option<AliasId>,
context: &PropertyParserContext,
) -> Result<(), ()> {
let id: NonCustomPropertyId;
if let Some(alias_id) = alias {
id = alias_id.into();
@ -1177,10 +1180,10 @@ impl PropertyId {
${id_set("DISALLOWED_IN_PAGE_RULE", lambda p: not p.allowed_in_page_rule)}
match context.rule_type {
CssRuleType::Keyframe if DISALLOWED_IN_KEYFRAME_BLOCK.contains(id) => {
return Err(PropertyDeclarationParseError::AnimationPropertyInKeyframeBlock)
return Err(());
}
CssRuleType::Page if DISALLOWED_IN_PAGE_RULE.contains(id) => {
return Err(PropertyDeclarationParseError::NotAllowedInPageRule)
return Err(())
}
_ => {}
}
@ -1245,15 +1248,15 @@ impl PropertyId {
if context.stylesheet_origin != Origin::UserAgent {
if EXPERIMENTAL.contains(id) {
if !passes_pref_check() {
return Err(PropertyDeclarationParseError::ExperimentalProperty);
return Err(())
}
} else {
return Err(PropertyDeclarationParseError::UnknownProperty(self.name().into()));
return Err(())
}
}
} else {
if EXPERIMENTAL.contains(id) && !passes_pref_check() {
return Err(PropertyDeclarationParseError::ExperimentalProperty);
return Err(());
}
}