diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/ConicGradientStyleValue.cpp b/Userland/Libraries/LibWeb/CSS/StyleValues/ConicGradientStyleValue.cpp index 72e7e20973..e93a3fc588 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/ConicGradientStyleValue.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/ConicGradientStyleValue.cpp @@ -45,7 +45,9 @@ void ConicGradientStyleValue::resolve_for_size(Layout::NodeWithStyleAndBoxModelM void ConicGradientStyleValue::paint(PaintContext& context, DevicePixelRect const& dest_rect, CSS::ImageRendering, Vector const& clip_paths) const { VERIFY(m_resolved.has_value()); - Painting::paint_conic_gradient(context, dest_rect, m_resolved->data, context.rounded_device_point(m_resolved->position), clip_paths); + auto destination_rect = dest_rect.to_type(); + auto position = context.rounded_device_point(m_resolved->position).to_type(); + context.recording_painter().fill_rect_with_conic_gradient(destination_rect, m_resolved->data, position, clip_paths); } bool ConicGradientStyleValue::equals(StyleValue const& other) const diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/LinearGradientStyleValue.cpp b/Userland/Libraries/LibWeb/CSS/StyleValues/LinearGradientStyleValue.cpp index 842bb32061..f6c62f0d62 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/LinearGradientStyleValue.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/LinearGradientStyleValue.cpp @@ -112,7 +112,7 @@ void LinearGradientStyleValue::resolve_for_size(Layout::NodeWithStyleAndBoxModel void LinearGradientStyleValue::paint(PaintContext& context, DevicePixelRect const& dest_rect, CSS::ImageRendering, Vector const& clip_paths) const { VERIFY(m_resolved.has_value()); - Painting::paint_linear_gradient(context, dest_rect, m_resolved->data, clip_paths); + context.recording_painter().fill_rect_with_linear_gradient(dest_rect.to_type(), m_resolved->data, clip_paths); } } diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/RadialGradientStyleValue.cpp b/Userland/Libraries/LibWeb/CSS/StyleValues/RadialGradientStyleValue.cpp index fbaa48f871..8105874f1e 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/RadialGradientStyleValue.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/RadialGradientStyleValue.cpp @@ -210,10 +210,9 @@ bool RadialGradientStyleValue::equals(StyleValue const& other) const void RadialGradientStyleValue::paint(PaintContext& context, DevicePixelRect const& dest_rect, CSS::ImageRendering, Vector const& clip_paths) const { VERIFY(m_resolved.has_value()); - Painting::paint_radial_gradient(context, dest_rect, m_resolved->data, - context.rounded_device_point(m_resolved->center), - context.rounded_device_size(m_resolved->gradient_size), - clip_paths); + auto center = context.rounded_device_point(m_resolved->center).to_type(); + auto size = context.rounded_device_size(m_resolved->gradient_size).to_type(); + context.recording_painter().fill_rect_with_radial_gradient(dest_rect.to_type(), m_resolved->data, center, size, clip_paths); } } diff --git a/Userland/Libraries/LibWeb/Painting/GradientPainting.cpp b/Userland/Libraries/LibWeb/Painting/GradientPainting.cpp index bab6894850..b6d4f627d4 100644 --- a/Userland/Libraries/LibWeb/Painting/GradientPainting.cpp +++ b/Userland/Libraries/LibWeb/Painting/GradientPainting.cpp @@ -146,19 +146,4 @@ RadialGradientData resolve_radial_gradient_data(Layout::NodeWithStyleAndBoxModel return { resolved_color_stops }; } -void paint_linear_gradient(PaintContext& context, DevicePixelRect const& gradient_rect, LinearGradientData const& data, Vector const& clip_paths) -{ - context.recording_painter().fill_rect_with_linear_gradient(gradient_rect.to_type(), data, clip_paths); -} - -void paint_conic_gradient(PaintContext& context, DevicePixelRect const& gradient_rect, ConicGradientData const& data, DevicePixelPoint position, Vector const& clip_paths) -{ - context.recording_painter().fill_rect_with_conic_gradient(gradient_rect.to_type(), data, position.to_type(), clip_paths); -} - -void paint_radial_gradient(PaintContext& context, DevicePixelRect const& gradient_rect, RadialGradientData const& data, DevicePixelPoint center, DevicePixelSize size, Vector const& clip_paths) -{ - context.recording_painter().fill_rect_with_radial_gradient(gradient_rect.to_type(), data, center.to_type(), size.to_type(), clip_paths); -} - } diff --git a/Userland/Libraries/LibWeb/Painting/GradientPainting.h b/Userland/Libraries/LibWeb/Painting/GradientPainting.h index a6ac04b51f..711599d7f9 100644 --- a/Userland/Libraries/LibWeb/Painting/GradientPainting.h +++ b/Userland/Libraries/LibWeb/Painting/GradientPainting.h @@ -20,8 +20,4 @@ LinearGradientData resolve_linear_gradient_data(Layout::NodeWithStyleAndBoxModel ConicGradientData resolve_conic_gradient_data(Layout::NodeWithStyleAndBoxModelMetrics const&, CSS::ConicGradientStyleValue const&); RadialGradientData resolve_radial_gradient_data(Layout::NodeWithStyleAndBoxModelMetrics const&, CSSPixelSize, CSS::RadialGradientStyleValue const&); -void paint_linear_gradient(PaintContext&, DevicePixelRect const&, LinearGradientData const&, Vector const& clip_paths = {}); -void paint_conic_gradient(PaintContext&, DevicePixelRect const&, ConicGradientData const&, DevicePixelPoint position, Vector const& clip_paths = {}); -void paint_radial_gradient(PaintContext&, DevicePixelRect const&, RadialGradientData const&, DevicePixelPoint position, DevicePixelSize size, Vector const& clip_paths = {}); - }