diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-05-15 09:13:38 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-15 09:13:38 -0500 |
commit | eb7314b4122ba981cdc98204660f9fa1ef43e698 (patch) | |
tree | af3ca480cd7cb0126ba98d0962f0974915b5c77b /components/script/dom/element.rs | |
parent | 9bc565362b8787768db77ac458c9fb8005e14023 (diff) | |
parent | dd38bba1be0d90cbffca6616c604eec1343d4ff3 (diff) | |
download | servo-eb7314b4122ba981cdc98204660f9fa1ef43e698.tar.gz servo-eb7314b4122ba981cdc98204660f9fa1ef43e698.zip |
Auto merge of #16859 - nox:gradients, r=emilio
Rewrite style images with a good dose of generics π
<!-- 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/16859)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/element.rs')
-rw-r--r-- | components/script/dom/element.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index d54b79cdc28..aa32370127c 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -109,7 +109,7 @@ use style::sink::Push; use style::stylearc::Arc; use style::stylist::ApplicableDeclarationBlock; use style::thread_state; -use style::values::CSSFloat; +use style::values::{CSSFloat, Either}; use style::values::specified::{self, CSSColor}; use stylesheet_loader::StylesheetOwner; @@ -427,9 +427,7 @@ impl LayoutElementHelpers for LayoutJS<Element> { shared_lock, PropertyDeclaration::BackgroundImage( background_image::SpecifiedValue(vec![ - background_image::single_value::SpecifiedValue(Some( - specified::Image::for_cascade(url.into()) - )) + Either::Second(specified::Image::for_cascade(url.into())) ])))); } |