Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Propagate image resolution errors in layout context (#36692)

Browse source 
This commit modifies layout context to propagate any issues that occur
during image
resolution.

At the moment, when errors occur during image resolution we propagate
None upwards. This
hides any potential issues that may be actionable, for example, we may
want to avoid
trying to load an image that failed to load for whatever reason or has
an invalid url.

This commit instead propagates these errors upwards to consumers where
they may become
actionable. This is part of an investigation into #36679.

Signed-off-by: Astraea Quinn Skoutelli
<astraea.quinn.skoutelli@huawei.com>

Signed-off-by: Astraea Quinn Skoutelli <astraea.quinn.skoutelli@huawei.com>
This commit is contained in:
Astraea Quinn S 2025-04-28 14:32:51 +02:00 • committed by GitHub
parent 4d975e947b
commit 56882a3d5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 51 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/layout/display_list/mod.rs
View file

@ -838,8 +838,8 @@ impl<'a> BuilderForBoxFragment<'a> {
// 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 builder.context.resolve_image(node, image) {
None => {},
Some(ResolvedImage::Gradient(gradient)) => {
Err(_) => {},
Ok(ResolvedImage::Gradient(gradient)) => {
let intrinsic = NaturalSizes::empty();
let Some(layer) =
&background::layout_layer(self, painter, builder, index, intrinsic)
@ -875,7 +875,7 @@ impl<'a> BuilderForBoxFragment<'a> {
},
}
},
Some(ResolvedImage::Image(image_info)) => {
Ok(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(
@ -1063,8 +1063,8 @@ impl<'a> BuilderForBoxFragment<'a> {
.context
.resolve_image(node, &border.border_image_source)
{
None => return false,
Some(ResolvedImage::Image(image_info)) => {
Err(_) => return false,
Ok(ResolvedImage::Image(image_info)) => {
let Some(key) = image_info.key else {
return false;
};
@ -1073,7 +1073,7 @@ impl<'a> BuilderForBoxFragment<'a> {
height = image_info.size.height as f32;
NinePatchBorderSource::Image(key, ImageRendering::Auto)
},
Some(ResolvedImage::Gradient(gradient)) => {
Ok(ResolvedImage::Gradient(gradient)) => {
match gradient::build(&self.fragment.style, gradient, border_image_size, builder) {
WebRenderGradient::Linear(gradient) => {
NinePatchBorderSource::Gradient(gradient)