diff --git a/Userland/Libraries/LibWeb/CSS/EdgeRect.cpp b/Userland/Libraries/LibWeb/CSS/EdgeRect.cpp index c432ef5c9d..01f14cbfe8 100644 --- a/Userland/Libraries/LibWeb/CSS/EdgeRect.cpp +++ b/Userland/Libraries/LibWeb/CSS/EdgeRect.cpp @@ -12,7 +12,7 @@ namespace Web::CSS { // https://www.w3.org/TR/CSS2/visufx.html#value-def-shape -Gfx::FloatRect EdgeRect::resolved(Layout::Node const& layout_node, Gfx::Rect border_box) const +CSSPixelRect EdgeRect::resolved(Layout::Node const& layout_node, CSSPixelRect border_box) const { // In CSS 2.1, the only valid value is: rect(, , , ) where // and specify offsets from the top border edge of the box, and , and @@ -24,11 +24,11 @@ Gfx::FloatRect EdgeRect::resolved(Layout::Node const& layout_node, Gfx::Rect, and the same as the used value of the width plus the sum of the // horizontal padding and border widths for , such that four 'auto' values result in the // clipping region being the same as the element's border box). - auto left = border_box.left() + (left_edge.is_auto() ? 0 : left_edge.to_px(layout_node).to_double()); - auto top = border_box.top() + (top_edge.is_auto() ? 0 : top_edge.to_px(layout_node).to_double()); - auto right = border_box.left() + (right_edge.is_auto() ? border_box.width() : right_edge.to_px(layout_node).to_double()); - auto bottom = border_box.top() + (bottom_edge.is_auto() ? border_box.height() : bottom_edge.to_px(layout_node).to_double()); - return Gfx::FloatRect { + auto left = border_box.left() + (left_edge.is_auto() ? 0 : left_edge.to_px(layout_node)); + auto top = border_box.top() + (top_edge.is_auto() ? 0 : top_edge.to_px(layout_node)); + auto right = border_box.left() + (right_edge.is_auto() ? border_box.width() : right_edge.to_px(layout_node)); + auto bottom = border_box.top() + (bottom_edge.is_auto() ? border_box.height() : bottom_edge.to_px(layout_node)); + return CSSPixelRect { left, top, right - left, diff --git a/Userland/Libraries/LibWeb/CSS/EdgeRect.h b/Userland/Libraries/LibWeb/CSS/EdgeRect.h index 6978ee765b..e6eb1f48b3 100644 --- a/Userland/Libraries/LibWeb/CSS/EdgeRect.h +++ b/Userland/Libraries/LibWeb/CSS/EdgeRect.h @@ -19,7 +19,7 @@ struct EdgeRect { Length right_edge; Length bottom_edge; Length left_edge; - Gfx::FloatRect resolved(Layout::Node const&, Gfx::Rect) const; + CSSPixelRect resolved(Layout::Node const&, CSSPixelRect) const; bool operator==(EdgeRect const&) const = default; }; diff --git a/Userland/Libraries/LibWeb/Painting/PaintableBox.cpp b/Userland/Libraries/LibWeb/Painting/PaintableBox.cpp index e0b24e9737..b1ca76a794 100644 --- a/Userland/Libraries/LibWeb/Painting/PaintableBox.cpp +++ b/Userland/Libraries/LibWeb/Painting/PaintableBox.cpp @@ -181,7 +181,7 @@ Optional PaintableBox::get_clip_rect() const auto clip = computed_values().clip(); if (clip.is_rect() && layout_box().is_absolutely_positioned()) { auto border_box = absolute_border_box_rect(); - return clip.to_rect().resolved(layout_node(), border_box.to_type()).to_type(); + return clip.to_rect().resolved(layout_node(), border_box); } return {}; }