From 987716ca4b97c777182dccd0e4a6c6b366ff484f Mon Sep 17 00:00:00 2001 From: chocolate-pie <106949016+chocolate-pie@users.noreply.github.com> Date: Sat, 29 Mar 2025 22:20:16 +0900 Subject: [PATCH] layout: Implement support for `image-set()` notation (#36210) Signed-off-by: Chocolate Pie <106949016+chocolate-pie@users.noreply.github.com> --- components/layout_2020/context.rs | 43 ++++++++- components/layout_2020/display_list/mod.rs | 92 +++++-------------- .../image-set-calc-x-rendering-2.html.ini | 2 - .../image-set-calc-x-rendering.html.ini | 2 - ...mage-set-conic-gradient-rendering.html.ini | 2 - .../image-set-dpcm-rendering.html.ini | 2 - .../image-set-dpi-rendering-2.html.ini | 2 - .../image-set-dpi-rendering.html.ini | 2 - .../image-set-dppx-rendering.html.ini | 2 - .../image-set-empty-url-rendering.html.ini | 2 - .../image-set-first-match-rendering.html.ini | 2 - ...age-set-linear-gradient-rendering.html.ini | 2 - .../image-set-no-res-rendering-2.html.ini | 2 - .../image-set-no-res-rendering.html.ini | 2 - .../image-set-no-url-rendering.html.ini | 2 - ...age-set-radial-gradient-rendering.html.ini | 2 - .../image-set/image-set-rendering-2.html.ini | 2 - .../image-set/image-set-rendering.html.ini | 2 - ...epeating-conic-gradient-rendering.html.ini | 2 - ...peating-linear-gradient-rendering.html.ini | 2 - ...peating-radial-gradient-rendering.html.ini | 2 - ...ge-set-type-first-match-rendering.html.ini | 2 - .../image-set-type-rendering-2.html.ini | 2 - .../image-set-type-rendering-3.html.ini | 2 - .../image-set-type-rendering.html.ini | 2 - ...t-type-skip-unsupported-rendering.html.ini | 2 - ...image-set-unordered-res-rendering.html.ini | 2 - 27 files changed, 61 insertions(+), 124 deletions(-) delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-calc-x-rendering-2.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-calc-x-rendering.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-conic-gradient-rendering.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-dpcm-rendering.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-dpi-rendering-2.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-dpi-rendering.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-dppx-rendering.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-empty-url-rendering.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-first-match-rendering.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-linear-gradient-rendering.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-no-res-rendering-2.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-no-res-rendering.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-no-url-rendering.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-radial-gradient-rendering.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-rendering-2.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-rendering.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-repeating-conic-gradient-rendering.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-repeating-linear-gradient-rendering.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-repeating-radial-gradient-rendering.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-type-first-match-rendering.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-type-rendering-2.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-type-rendering-3.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-type-rendering.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-type-skip-unsupported-rendering.html.ini delete mode 100644 tests/wpt/meta/css/css-images/image-set/image-set-unordered-res-rendering.html.ini diff --git a/components/layout_2020/context.rs b/components/layout_2020/context.rs index c825852dae5..04374849f74 100644 --- a/components/layout_2020/context.rs +++ b/components/layout_2020/context.rs @@ -12,11 +12,12 @@ use net_traits::image_cache::{ ImageCache, ImageCacheResult, ImageOrMetadataAvailable, UsePlaceholder, }; use parking_lot::{Mutex, RwLock}; -use pixels::Image; +use pixels::Image as PixelImage; use script_layout_interface::{IFrameSizes, ImageAnimationState, PendingImage, PendingImageState}; use servo_url::{ImmutableOrigin, ServoUrl}; use style::context::SharedStyleContext; use style::dom::OpaqueNode; +use style::values::computed::image::{Gradient, Image}; use crate::display_list::WebRenderImageInfo; @@ -46,6 +47,11 @@ pub struct LayoutContext<'a> { pub node_image_animation_map: Arc>>, } +pub enum ResolvedImage<'a> { + Gradient(&'a Gradient), + Image(WebRenderImageInfo), +} + impl Drop for LayoutContext<'_> { fn drop(&mut self) { if !std::thread::panicking() { @@ -104,7 +110,7 @@ impl LayoutContext<'_> { } } - pub fn handle_animated_image(&self, node: OpaqueNode, image: Arc) { + pub fn handle_animated_image(&self, node: OpaqueNode, image: Arc) { let mut store = self.node_image_animation_map.write(); // 1. first check whether node previously being track for animated image. @@ -124,7 +130,7 @@ impl LayoutContext<'_> { } } - pub fn get_webrender_image_for_url( + fn get_webrender_image_for_url( &self, node: OpaqueNode, url: ServoUrl, @@ -157,4 +163,35 @@ impl LayoutContext<'_> { None | Some(ImageOrMetadataAvailable::MetadataAvailable(..)) => None, } } + + pub fn resolve_image<'a>( + &self, + node: Option, + image: &'a Image, + ) -> Option> { + match image { + // TODO: Add support for PaintWorklet and CrossFade rendering. + Image::None | Image::CrossFade(_) | Image::PaintWorklet(_) => None, + Image::Gradient(gradient) => Some(ResolvedImage::Gradient(gradient)), + Image::Url(image_url) => { + // FIXME: images won’t always have in intrinsic width or + // height when support for SVG is added, or a WebRender + // `ImageKey`, for that matter. + // + // FIXME: It feels like this should take into account the pseudo + // element and not just the node. + let image_url = image_url.url()?; + let webrender_info = self.get_webrender_image_for_url( + node?, + image_url.clone().into(), + UsePlaceholder::No, + )?; + Some(ResolvedImage::Image(webrender_info)) + }, + Image::ImageSet(image_set) => image_set + .items + .get(image_set.selected_index) + .and_then(|image| self.resolve_image(node, &image.image)), + } + } } diff --git a/components/layout_2020/display_list/mod.rs b/components/layout_2020/display_list/mod.rs index bc5032148f3..d6f9b533337 100644 --- a/components/layout_2020/display_list/mod.rs +++ b/components/layout_2020/display_list/mod.rs @@ -12,7 +12,6 @@ use embedder_traits::Cursor; use euclid::{Point2D, SideOffsets2D, Size2D, UnknownUnit}; use fonts::GlyphStore; use gradient::WebRenderGradient; -use net_traits::image_cache::UsePlaceholder; use servo_geometry::MaxRect; use style::Zero; use style::color::{AbsoluteColor, ColorSpace}; @@ -22,7 +21,6 @@ use style::dom::OpaqueNode; use style::properties::ComputedValues; use style::properties::longhands::visibility::computed_value::T as Visibility; use style::properties::style_structs::Border; -use style::values::computed::image::Image; use style::values::computed::{ BorderImageSideWidth, BorderImageWidth, BorderStyle, LengthPercentage, NonNegativeLengthOrNumber, NumberOrPercentage, OutlineStyle, @@ -39,7 +37,7 @@ use webrender_api::{ use webrender_traits::display_list::{AxesScrollSensitivity, CompositorDisplayListInfo}; use wr::units::LayoutVector2D; -use crate::context::LayoutContext; +use crate::context::{LayoutContext, ResolvedImage}; use crate::display_list::conversions::ToWebRender; use crate::display_list::stacking_context::StackingContextSection; use crate::fragment_tree::{ @@ -774,11 +772,12 @@ impl<'a> BuilderForBoxFragment<'a> { ) { let style = painter.style; let b = style.get_background(); + let node = self.fragment.base.tag.map(|tag| tag.node); // Reverse because the property is top layer first, we want to paint bottom layer first. for (index, image) in b.background_image.0.iter().enumerate().rev() { - match image { - Image::None => {}, - Image::Gradient(gradient) => { + match builder.context.resolve_image(node, image) { + None => {}, + Some(ResolvedImage::Gradient(gradient)) => { let intrinsic = NaturalSizes::empty(); let Some(layer) = &background::layout_layer(self, painter, builder, index, intrinsic) @@ -814,40 +813,16 @@ impl<'a> BuilderForBoxFragment<'a> { }, } }, - Image::Url(image_url) => { - // FIXME: images won’t always have in intrinsic width or - // height when support for SVG is added, or a WebRender - // `ImageKey`, for that matter. - // - // FIXME: It feels like this should take into account the pseudo - // element and not just the node. - let node = match self.fragment.base.tag { - Some(tag) => tag.node, - None => continue, - }; - let image_url = match image_url.url() { - Some(url) => url.clone(), - None => continue, - }; - let (width, height, key) = match builder.context.get_webrender_image_for_url( - node, - image_url.into(), - UsePlaceholder::No, - ) { - Some(WebRenderImageInfo { - width, - height, - key: Some(key), - }) => (width, height, key), - _ => continue, - }; - + Some(ResolvedImage::Image(image_info)) => { // FIXME: https://drafts.csswg.org/css-images-4/#the-image-resolution let dppx = 1.0; let intrinsic = NaturalSizes::from_width_and_height( - width as f32 / dppx, - height as f32 / dppx, + image_info.width as f32 / dppx, + image_info.height as f32 / dppx, ); + let Some(image_key) = image_info.key else { + continue; + }; if let Some(layer) = background::layout_layer(self, painter, builder, index, intrinsic) @@ -860,7 +835,7 @@ impl<'a> BuilderForBoxFragment<'a> { layer.tile_spacing, style.clone_image_rendering().to_webrender(), wr::AlphaType::PremultipliedAlpha, - key, + image_key, wr::ColorF::WHITE, ) } else { @@ -869,18 +844,12 @@ impl<'a> BuilderForBoxFragment<'a> { layer.bounds, style.clone_image_rendering().to_webrender(), wr::AlphaType::PremultipliedAlpha, - key, + image_key, wr::ColorF::WHITE, ) } } }, - Image::PaintWorklet(_) => { - // TODO: Add support for PaintWorklet rendering. - }, - Image::ImageSet(..) | Image::CrossFade(..) => { - // TODO: Add support for ImageSet and CrossFade rendering. - }, } } } @@ -1027,29 +996,13 @@ impl<'a> BuilderForBoxFragment<'a> { let stops = Vec::new(); let mut width = border_image_size.width; let mut height = border_image_size.height; - let source = match border.border_image_source { - Image::Url(ref image_url) => { - // FIXME: images won’t always have in intrinsic width or - // height when support for SVG is added, or a WebRender - // `ImageKey`, for that matter. - // - // FIXME: It feels like this should take into account the pseudo - // element and not just the node. - let Some(tag) = self.fragment.base.tag else { - return false; - }; - let Some(image_url) = image_url.url() else { - return false; - }; - - let Some(image_info) = builder.context.get_webrender_image_for_url( - tag.node, - image_url.clone().into(), - UsePlaceholder::No, - ) else { - return false; - }; - + let node = self.fragment.base.tag.map(|tag| tag.node); + let source = match builder + .context + .resolve_image(node, &border.border_image_source) + { + None => return false, + Some(ResolvedImage::Image(image_info)) => { let Some(key) = image_info.key else { return false; }; @@ -1058,7 +1011,7 @@ impl<'a> BuilderForBoxFragment<'a> { height = image_info.height as f32; NinePatchBorderSource::Image(key, ImageRendering::Auto) }, - Image::Gradient(ref gradient) => { + Some(ResolvedImage::Gradient(gradient)) => { match gradient::build(&self.fragment.style, gradient, border_image_size, builder) { WebRenderGradient::Linear(gradient) => { NinePatchBorderSource::Gradient(gradient) @@ -1071,9 +1024,6 @@ impl<'a> BuilderForBoxFragment<'a> { }, } }, - Image::CrossFade(_) | Image::ImageSet(_) | Image::None | Image::PaintWorklet(_) => { - return false; - }, }; let size = euclid::Size2D::new(width as i32, height as i32); diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-calc-x-rendering-2.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-calc-x-rendering-2.html.ini deleted file mode 100644 index 67e228c5c71..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-calc-x-rendering-2.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-calc-x-rendering-2.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-calc-x-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-calc-x-rendering.html.ini deleted file mode 100644 index 6acf49fb4cf..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-calc-x-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-calc-x-rendering.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-conic-gradient-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-conic-gradient-rendering.html.ini deleted file mode 100644 index 95d9cf7bd8d..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-conic-gradient-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-conic-gradient-rendering.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-dpcm-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-dpcm-rendering.html.ini deleted file mode 100644 index d454c16a88c..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-dpcm-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-dpcm-rendering.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-dpi-rendering-2.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-dpi-rendering-2.html.ini deleted file mode 100644 index a5211dfef59..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-dpi-rendering-2.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-dpi-rendering-2.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-dpi-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-dpi-rendering.html.ini deleted file mode 100644 index 5f8b0c91cfd..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-dpi-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-dpi-rendering.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-dppx-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-dppx-rendering.html.ini deleted file mode 100644 index efd602a658c..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-dppx-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-dppx-rendering.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-empty-url-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-empty-url-rendering.html.ini deleted file mode 100644 index 1d08d9a00db..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-empty-url-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-empty-url-rendering.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-first-match-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-first-match-rendering.html.ini deleted file mode 100644 index dbe1af067b5..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-first-match-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-first-match-rendering.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-linear-gradient-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-linear-gradient-rendering.html.ini deleted file mode 100644 index b58c2976a59..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-linear-gradient-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-linear-gradient-rendering.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-no-res-rendering-2.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-no-res-rendering-2.html.ini deleted file mode 100644 index 08008d3f359..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-no-res-rendering-2.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-no-res-rendering-2.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-no-res-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-no-res-rendering.html.ini deleted file mode 100644 index a41f43b3667..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-no-res-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-no-res-rendering.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-no-url-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-no-url-rendering.html.ini deleted file mode 100644 index 02013c51fac..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-no-url-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-no-url-rendering.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-radial-gradient-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-radial-gradient-rendering.html.ini deleted file mode 100644 index 3fcaf7fed89..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-radial-gradient-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-radial-gradient-rendering.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-rendering-2.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-rendering-2.html.ini deleted file mode 100644 index efe4a56ec9a..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-rendering-2.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-rendering-2.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-rendering.html.ini deleted file mode 100644 index cac31096a81..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-rendering.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-repeating-conic-gradient-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-repeating-conic-gradient-rendering.html.ini deleted file mode 100644 index f18e1ef9a00..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-repeating-conic-gradient-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-repeating-conic-gradient-rendering.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-repeating-linear-gradient-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-repeating-linear-gradient-rendering.html.ini deleted file mode 100644 index be70642abe0..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-repeating-linear-gradient-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-repeating-linear-gradient-rendering.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-repeating-radial-gradient-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-repeating-radial-gradient-rendering.html.ini deleted file mode 100644 index cfb95cb1d12..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-repeating-radial-gradient-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-repeating-radial-gradient-rendering.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-type-first-match-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-type-first-match-rendering.html.ini deleted file mode 100644 index c2d57169c84..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-type-first-match-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-type-first-match-rendering.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-type-rendering-2.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-type-rendering-2.html.ini deleted file mode 100644 index f480267c00c..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-type-rendering-2.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-type-rendering-2.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-type-rendering-3.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-type-rendering-3.html.ini deleted file mode 100644 index 5fb71d1d469..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-type-rendering-3.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-type-rendering-3.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-type-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-type-rendering.html.ini deleted file mode 100644 index 3122f4bfd04..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-type-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-type-rendering.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-type-skip-unsupported-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-type-skip-unsupported-rendering.html.ini deleted file mode 100644 index b2c04c8932e..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-type-skip-unsupported-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-type-skip-unsupported-rendering.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-unordered-res-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-unordered-res-rendering.html.ini deleted file mode 100644 index 38b95a653ec..00000000000 --- a/tests/wpt/meta/css/css-images/image-set/image-set-unordered-res-rendering.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[image-set-unordered-res-rendering.html] - expected: FAIL