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

Filter out non-applying properties when cascading style for ::first-letter/::first-line/::placeholder. r=emilio

Browse source 
Part 3 of the fix for Gecko bug 1382786 <https://bugzilla.mozilla.org/show_bug.cgi?id=1382786>.
This commit is contained in:
Boris Zbarsky 2017-07-21 14:16:06 -04:00
parent 592a96fc06
commit 86b3b6a32f
3 changed files with 41 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2872,11 +2872,26 @@ pub fn cascade(
&[]
};
let node_importance = node.importance();
let property_restriction = pseudo.and_then(|p| p.property_restriction());
declarations
.iter()
// Yield declarations later in source order (with more precedence) first.
.rev()
.filter_map(move |&(ref declaration, declaration_importance)| {
if let Some(property_restriction) = property_restriction {
// declaration.id() is either a longhand or a custom
// property. Custom properties are always allowed, but
// longhands are only allowed if they have our
// property_restriction flag set.
if let PropertyDeclarationId::Longhand(id) = declaration.id() {
if !id.flags().contains(property_restriction) {
return None
}
}
}
if declaration_importance == node_importance {
Some((declaration, cascade_level))
} else {