diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-06-07 21:03:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-07 21:03:52 -0700 |
| commit | 24e944ad94816e607e833e34095c4f8b8136df4c (patch) | |
| tree | aa3f07d3a7c66a4cb065f9030b29fc3fd5f71e39 /components/style/rule_tree/mod.rs | |
| parent | c0f3ec87806a0d718d7f9ef1ccb912c78fc482d2 (diff) | |
| parent | 5c643adb9831ef9c59b96da2eb6349554afa2441 (diff) | |
| download | servo-24e944ad94816e607e833e34095c4f8b8136df4c.tar.gz servo-24e944ad94816e607e833e34095c4f8b8136df4c.zip | |
Auto merge of #17219 - upsuper:currentcolor, r=Manishearth,birtles
Support interpolation between currentcolor and numeric color
This is the Servo side change of [bug 1345709](https://bugzilla.mozilla.org/show_bug.cgi?id=1345709).
<!-- 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/17219)
<!-- Reviewable:end -->
Diffstat (limited to 'components/style/rule_tree/mod.rs')
| -rw-r--r-- | components/style/rule_tree/mod.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/components/style/rule_tree/mod.rs b/components/style/rule_tree/mod.rs index 37e7334b9db..c51f6f94ff7 100644 --- a/components/style/rule_tree/mod.rs +++ b/components/style/rule_tree/mod.rs @@ -912,7 +912,6 @@ impl StrongRuleNode { -> bool where E: ::dom::TElement { - use cssparser::RGBA; use gecko_bindings::structs::{NS_AUTHOR_SPECIFIED_BACKGROUND, NS_AUTHOR_SPECIFIED_BORDER}; use gecko_bindings::structs::{NS_AUTHOR_SPECIFIED_PADDING, NS_AUTHOR_SPECIFIED_TEXT_SHADOW}; use properties::{CSSWideKeyword, LonghandId, LonghandIdSet}; @@ -1083,7 +1082,7 @@ impl StrongRuleNode { if properties.contains(id) { if !author_colors_allowed { if let PropertyDeclaration::BackgroundColor(ref color) = *declaration { - return color.parsed == Color::RGBA(RGBA::transparent()) + return *color == Color::transparent() } } return true |