From e62ad7e68017d31309aa664abb7427944c92f654 Mon Sep 17 00:00:00 2001 From: Pyfisch Date: Sat, 29 Apr 2017 20:00:13 +0200 Subject: [PATCH] Implement -webkit-radial-gradient aliases. In display_list_builder.rs handle cover and contain size keywords. --- components/layout/display_list_builder.rs | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs index a2453067e1f..801f739fc7a 100644 --- a/components/layout/display_list_builder.rs +++ b/components/layout/display_list_builder.rs @@ -710,7 +710,7 @@ fn convert_circle_size_keyword(keyword: SizeKeyword, center: &Point2D) -> Size2D { use style::values::computed::image::SizeKeyword::*; let radius = match keyword { - ClosestSide => { + ClosestSide | Contain => { let dist = get_distance_to_sides(size, center, ::std::cmp::min); ::std::cmp::min(dist.width, dist.height) } @@ -719,12 +719,7 @@ fn convert_circle_size_keyword(keyword: SizeKeyword, ::std::cmp::max(dist.width, dist.height) } ClosestCorner => get_distance_to_corner(size, center, ::std::cmp::min), - FarthestCorner => get_distance_to_corner(size, center, ::std::cmp::max), - _ => { - // TODO(#16542) - println!("TODO: implement size keyword {:?} for circles", keyword); - Au::new(0) - } + FarthestCorner | Cover => get_distance_to_corner(size, center, ::std::cmp::max), }; Size2D::new(radius, radius) } @@ -736,15 +731,10 @@ fn convert_ellipse_size_keyword(keyword: SizeKeyword, center: &Point2D) -> Size2D { use style::values::computed::image::SizeKeyword::*; match keyword { - ClosestSide => get_distance_to_sides(size, center, ::std::cmp::min), + ClosestSide | Contain => get_distance_to_sides(size, center, ::std::cmp::min), FarthestSide => get_distance_to_sides(size, center, ::std::cmp::max), ClosestCorner => get_ellipse_radius(size, center, ::std::cmp::min), - FarthestCorner => get_ellipse_radius(size, center, ::std::cmp::max), - _ => { - // TODO(#16542) - println!("TODO: implement size keyword {:?} for ellipses", keyword); - Size2D::new(Au::new(0), Au::new(0)) - } + FarthestCorner | Cover => get_ellipse_radius(size, center, ::std::cmp::max), } }