diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2017-03-07 17:12:37 +0100 |
---|---|---|
committer | Simon Sapin <simon.sapin@exyr.org> | 2017-03-07 23:37:29 +0100 |
commit | 9d663ea7af3771531e87669d8323916e9f106075 (patch) | |
tree | ee8faffd5a05029bf6bf6f3b6ce7f6acd4a59734 /components/script/dom/cssstyledeclaration.rs | |
parent | 81604902724d928eb29e3178a52f89aa679818e6 (diff) | |
download | servo-9d663ea7af3771531e87669d8323916e9f106075.tar.gz servo-9d663ea7af3771531e87669d8323916e9f106075.zip |
Make PropertyDeclaration::parse return an enum rather than push to a Vec.
Diffstat (limited to 'components/script/dom/cssstyledeclaration.rs')
-rw-r--r-- | components/script/dom/cssstyledeclaration.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs index f658ed5375e..450d0b7da4b 100644 --- a/components/script/dom/cssstyledeclaration.rs +++ b/components/script/dom/cssstyledeclaration.rs @@ -250,14 +250,14 @@ impl CSSStyleDeclaration { // Step 6 let window = self.owner.window(); - let declarations = + let result = parse_one_declaration(id, &value, &self.owner.base_url(), window.css_error_reporter(), ParserContextExtraData::default()); // Step 7 - let declarations = match declarations { - Ok(declarations) => declarations, + let parsed = match result { + Ok(parsed) => parsed, Err(_) => { *changed = false; return Ok(()); @@ -267,9 +267,9 @@ impl CSSStyleDeclaration { // Step 8 // Step 9 *changed = false; - for declaration in declarations { - *changed |= pdb.set_parsed_declaration(declaration.0, importance); - } + parsed.expand(|declaration| { + *changed |= pdb.set_parsed_declaration(declaration, importance); + }); Ok(()) }) |