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

Replace ParsedDeclaration::expand with non-generic method

Browse source 
... to reduce its code size impact.

https://bugzilla.mozilla.org/show_bug.cgi?id=1351737
This commit is contained in:
Simon Sapin 2017-03-29 20:14:41 +02:00
parent 3345b83fb3
commit 4f2b9a33fe
5 changed files with 70 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -88,7 +88,7 @@ impl PropertyDeclarationBlock {
&self.declarations
}
/// Returns wheather this block contains any declaration with `!important`.
/// Returns whether this block contains any declaration with `!important`.
///
/// This is based on the `important_count` counter,
/// which should be maintained whenever `declarations` is changed.
@ -97,7 +97,7 @@ impl PropertyDeclarationBlock {
self.important_count > 0
}
/// Returns wheather this block contains any declaration without `!important`.
/// Returns whether this block contains any declaration without `!important`.
///
/// This is based on the `important_count` counter,
/// which should be maintained whenever `declarations` is changed.
@ -202,16 +202,9 @@ impl PropertyDeclarationBlock {
self.push_common(declaration, importance, false);
}
/// Adds or overrides the declaration for a given property in this block,
/// Returns whether the declaration block is actually changed.
pub fn set_parsed_declaration(&mut self,
declaration: PropertyDeclaration,
importance: Importance) -> bool {
self.push_common(declaration, importance, true)
}
fn push_common(&mut self, declaration: PropertyDeclaration, importance: Importance,
overwrite_more_important: bool) -> bool {
/// Implementation detail of push and ParsedDeclaration::expand*
pub fn push_common(&mut self, declaration: PropertyDeclaration, importance: Importance,
overwrite_more_important: bool) -> bool {
let definitely_new = if let PropertyDeclarationId::Longhand(id) = declaration.id() {
!self.longhands.contains(id)
} else {
@ -697,7 +690,7 @@ pub fn parse_property_declaration_list(context: &ParserContext,
let mut iter = DeclarationListParser::new(input, parser);
while let Some(declaration) = iter.next() {
match declaration {
Ok((parsed, importance)) => parsed.expand(|d| block.push(d, importance)),
Ok((parsed, importance)) => parsed.expand_push_into(&mut block, importance),
Err(range) => {
let pos = range.start;
let message = format!("Unsupported property declaration: '{}'",