RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 09:17:35 +00:00
Code Issues Activity Actions

LibWeb: Remove redundant Length::resolved() calls

Browse source 
Now that calc() is also resolved in to_px(), code in the form
`foo.resolved(bar).to_px(bar)` can be simplified to `foo.to_px(bar)`.
This commit is contained in:
Sam Atkins 2022-02-18 16:27:28 +00:00 • committed by Andreas Kling
parent 6df3f9920d
commit b715943035
9 changed files with 60 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Userland/Libraries/LibWeb/Painting/BackgroundPainting.cpp
View file

@ -88,22 +88,14 @@ void paint_background(PaintContext& context, Layout::NodeWithStyleAndBoxModelMet
width = image.width();
height = image.height();
} else if (x_is_auto) {
height = layer.size_y.resolved(layout_node, CSS::Length::make_px(background_positioning_area.height()))
.resolved(layout_node)
.to_px(layout_node);
height = layer.size_y.resolved(layout_node, CSS::Length::make_px(background_positioning_area.height())).to_px(layout_node);
width = roundf(image.width() * ((float)height / (float)image.height()));
} else if (y_is_auto) {
width = layer.size_x.resolved(layout_node, CSS::Length::make_px(background_positioning_area.width()))
.resolved(layout_node)
.to_px(layout_node);
width = layer.size_x.resolved(layout_node, CSS::Length::make_px(background_positioning_area.width())).to_px(layout_node);
height = roundf(image.height() * ((float)width / (float)image.width()));
} else {
width = layer.size_x.resolved(layout_node, CSS::Length::make_px(background_positioning_area.width()))
.resolved(layout_node)
.to_px(layout_node);
height = layer.size_y.resolved(layout_node, CSS::Length::make_px(background_positioning_area.height()))
.resolved(layout_node)
.to_px(layout_node);
width = layer.size_x.resolved(layout_node, CSS::Length::make_px(background_positioning_area.width())).to_px(layout_node);
height = layer.size_y.resolved(layout_node, CSS::Length::make_px(background_positioning_area.height())).to_px(layout_node);
}
image_rect.set_size(width, height);
@ -143,18 +135,14 @@ void paint_background(PaintContext& context, Layout::NodeWithStyleAndBoxModelMet
int space_y = background_positioning_area.height() - image_rect.height();
// Position
int offset_x = layer.position_offset_x.resolved(layout_node, CSS::Length::make_px(space_x))
.resolved(layout_node)
.to_px(layout_node);
int offset_x = layer.position_offset_x.resolved(layout_node, CSS::Length::make_px(space_x)).to_px(layout_node);
if (layer.position_edge_x == CSS::PositionEdge::Right) {
image_rect.set_right_without_resize(background_positioning_area.right() - offset_x);
} else {
image_rect.set_left(background_positioning_area.left() + offset_x);
}
int offset_y = layer.position_offset_y.resolved(layout_node, CSS::Length::make_px(space_y))
.resolved(layout_node)
.to_px(layout_node);
int offset_y = layer.position_offset_y.resolved(layout_node, CSS::Length::make_px(space_y)).to_px(layout_node);
if (layer.position_edge_y == CSS::PositionEdge::Bottom) {
image_rect.set_bottom_without_resize(background_positioning_area.bottom() - offset_y);
} else {

8
Userland/Libraries/LibWeb/Painting/BorderPainting.cpp
View file

@ -17,10 +17,10 @@ BorderRadiusData normalized_border_radius_data(Layout::Node const& node, Gfx::Fl
// Spec just says "Refer to corresponding dimension of the border box."
// For now, all relative values are relative to the width.
auto width_length = CSS::Length::make_px(rect.width());
auto bottom_left_radius_px = bottom_left_radius.resolved(node, width_length).resolved(node).to_px(node);
auto bottom_right_radius_px = bottom_right_radius.resolved(node, width_length).resolved(node).to_px(node);
auto top_left_radius_px = top_left_radius.resolved(node, width_length).resolved(node).to_px(node);
auto top_right_radius_px = top_right_radius.resolved(node, width_length).resolved(node).to_px(node);
auto bottom_left_radius_px = bottom_left_radius.resolved(node, width_length).to_px(node);
auto bottom_right_radius_px = bottom_right_radius.resolved(node, width_length).to_px(node);
auto top_left_radius_px = top_left_radius.resolved(node, width_length).to_px(node);
auto top_right_radius_px = top_right_radius.resolved(node, width_length).to_px(node);
// Scale overlapping curves according to https://www.w3.org/TR/css-backgrounds-3/#corner-overlap
auto f = 1.0f;