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

Auto merge of #15089 - Manishearth:less-vec, r=SimonSapin

Browse source 
Reduce allocator churn when parsing property declaration blocks

fixes #15060

cc @emilio

r? @SimonSapin

<!-- 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/15089)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-01-18 17:41:05 -08:00 • committed by GitHub
commit 5e888b5504
6 changed files with 81 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/script/dom/cssstyledeclaration.rs
View file

@ -193,7 +193,7 @@ impl CSSStyleDeclaration {
ParserContextExtraData::default());
// Step 7
let declarations = match declarations {
let mut declarations = match declarations {
Ok(declarations) => declarations,
Err(_) => return Ok(())
};
@ -204,7 +204,7 @@ impl CSSStyleDeclaration {
Some(ref lock) => {
let mut style_attribute = lock.write();
for declaration in declarations {
style_attribute.set_parsed_declaration(declaration, importance);
style_attribute.set_parsed_declaration(declaration.0, importance);
}
self.owner.flush_style(&style_attribute);
}
@ -214,8 +214,11 @@ impl CSSStyleDeclaration {
} else {
0
};
for decl in &mut declarations {
decl.1 = importance
}
let block = PropertyDeclarationBlock {
declarations: declarations.into_iter().map(|d| (d, importance)).collect(),
declarations: declarations,
important_count: important_count,
};
if let CSSStyleOwner::Element(ref el) = self.owner {