Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Implement support for image-set() notation (#36210)

Browse source 
Signed-off-by: Chocolate Pie <106949016+chocolate-pie@users.noreply.github.com>
This commit is contained in:
chocolate-pie 2025-03-29 22:20:16 +09:00 • committed by GitHub
parent 40133ce29a
commit 987716ca4b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 61 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

92
components/layout_2020/display_list/mod.rs
View file

@ -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);