Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-02 21:13:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Add a declaration iterator to AllShorthand for simplify code.

Browse source 
Bug: 1461285
Reviewed-by: emilio
MozReview-Commit-ID: 9w2B3SpdkQo
This commit is contained in:
Xidorn Quan 2018-07-11 10:52:52 +10:00 • committed by Emilio Cobos Álvarez
parent 36038869aa
commit 2be1375745
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 47 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

31
components/style/properties/declaration_block.rs
View file

@ -455,34 +455,9 @@ impl PropertyDeclarationBlock {
mode,
);
}
match drain.all_shorthand {
AllShorthand::NotSet => {}
AllShorthand::CSSWideKeyword(keyword) => {
for id in ShorthandId::All.longhands() {
let decl = PropertyDeclaration::CSSWideKeyword(
WideKeywordDeclaration { id, keyword },
);
changed |= self.push(
decl,
importance,
mode,
);
}
}
AllShorthand::WithVariables(unparsed) => {
for id in ShorthandId::All.longhands() {
let decl = PropertyDeclaration::WithVariables(
VariableDeclaration { id, value: unparsed.clone() },
);
changed |= self.push(
decl,
importance,
mode,
);
}
}
}
changed
drain.all_shorthand.declarations().fold(changed, |changed, decl| {
changed | self.push(decl, importance, mode)
})
}
/// Adds or overrides the declaration for a given property in this block.

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

@ -2222,6 +2222,50 @@ enum AllShorthand {
WithVariables(Arc<UnparsedValue>)
}
impl AllShorthand {
/// Iterates property declarations from the given all shorthand value.
#[inline]
fn declarations(&self) -> AllShorthandDeclarationIterator {
AllShorthandDeclarationIterator {
all_shorthand: self,
longhands: ShorthandId::All.longhands(),
}
}
}
struct AllShorthandDeclarationIterator<'a> {
all_shorthand: &'a AllShorthand,
longhands: NonCustomPropertyIterator<LonghandId>,
}
impl<'a> Iterator for AllShorthandDeclarationIterator<'a> {
type Item = PropertyDeclaration;
#[inline]
fn next(&mut self) -> Option<Self::Item> {
match *self.all_shorthand {
AllShorthand::NotSet => None,
AllShorthand::CSSWideKeyword(ref keyword) => {
Some(PropertyDeclaration::CSSWideKeyword(
WideKeywordDeclaration {
id: self.longhands.next()?,
keyword: *keyword
}
))
}
AllShorthand::WithVariables(ref unparsed) => {
let id = self.longhands.next()?;
Some(PropertyDeclaration::WithVariables(
VariableDeclaration {
id: self.longhands.next()?,
value: unparsed.clone()
}
))
}
}
}
}
#[cfg(feature = "gecko")]
pub use gecko_properties::style_structs;