aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout_2020/lists.rs
diff options
context:
space:
mode:
authorEmilio Cobos Álvarez <emilio@crisal.io>2021-02-26 12:40:48 +0100
committerEmilio Cobos Álvarez <emilio@crisal.io>2021-02-26 17:53:55 +0100
commit31e8e418ea888b3366128ba42a9c771780f97e87 (patch)
treef47d0f809e944341d1ea6a724153c2e7386ca2ba /components/layout_2020/lists.rs
parent5158f658104c1edbb87a94958c4ab424d3b854b4 (diff)
downloadservo-31e8e418ea888b3366128ba42a9c771780f97e87.tar.gz
servo-31e8e418ea888b3366128ba42a9c771780f97e87.zip
Miscellaneous build / tidy fixes.
Diffstat (limited to 'components/layout_2020/lists.rs')
-rw-r--r--components/layout_2020/lists.rs11
1 files changed, 8 insertions, 3 deletions
diff --git a/components/layout_2020/lists.rs b/components/layout_2020/lists.rs
index c8fa7eabee3..99074747599 100644
--- a/components/layout_2020/lists.rs
+++ b/components/layout_2020/lists.rs
@@ -7,7 +7,7 @@ use crate::dom_traversal::{NodeAndStyleInfo, NodeExt, PseudoElementContentItem};
use crate::replaced::ReplacedContent;
use style::properties::longhands::list_style_type::computed_value::T as ListStyleType;
use style::properties::style_structs;
-use style::values::computed::url::UrlOrNone;
+use style::values::computed::Image;
/// https://drafts.csswg.org/css-lists/#content-property
pub(crate) fn make_marker<'dom, Node>(
@@ -21,13 +21,18 @@ where
// https://drafts.csswg.org/css-lists/#marker-image
let marker_image = || match &style.list_style_image {
- UrlOrNone::Url(url) => Some(vec![
+ Image::Url(url) => Some(vec![
PseudoElementContentItem::Replaced(ReplacedContent::from_image_url(
info.node, context, url,
)?),
PseudoElementContentItem::Text(" ".into()),
]),
- UrlOrNone::None => None,
+ // XXX: Non-None image types unimplemented.
+ Image::ImageSet(..) |
+ Image::Rect(..) |
+ Image::Gradient(..) |
+ Image::CrossFade(..) |
+ Image::None => None,
};
marker_image().or_else(|| {
Some(vec![PseudoElementContentItem::Text(