Auto merge of #7188 - servo:set_inline_style_property_priority, r=nox

Fix Element::set_inline_style_property_priority’s handling of priority

Thanks to @michaelwu for pointing out a copy-paste error.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7188)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-15 09:17:31 -06:00
commit 31413f4313
3 changed files with 18 additions and 4 deletions

View file

@ -713,7 +713,7 @@ impl<'a> ElementHelpers<'a> for &'a Element {
let (from, to) = if style_priority == StylePriority::Important {
(&mut declarations.normal, &mut declarations.important)
} else {
(&mut declarations.normal, &mut declarations.important)
(&mut declarations.important, &mut declarations.normal)
};
// Usually, the reference counts of `from` and `to` will be 1 here. But transitions