LibWeb: Fix painting masks/clipPaths that are not local to the SVG

Previously, the SVGPathPaintable walked up the DOM tree to find the
containing SVG, however, this does not hold for masks/clipPaths that
are not local to the current SVG. Instead, we should walk the layout
tree where we should always be able to find the current SVG as an
ancestor.
This commit is contained in:
MacDue 2024-05-04 16:49:11 +01:00 committed by Andreas Kling
parent f7ba07cc8b
commit 033877f628
Notes: sideshowbarker 2024-07-16 23:23:26 +09:00

View File

@ -7,7 +7,7 @@
#include <LibGfx/AntiAliasingPainter.h> #include <LibGfx/AntiAliasingPainter.h>
#include <LibWeb/Painting/SVGPathPaintable.h> #include <LibWeb/Painting/SVGPathPaintable.h>
#include <LibWeb/SVG/SVGSVGElement.h> #include <LibWeb/Painting/SVGSVGPaintable.h>
namespace Web::Painting { namespace Web::Painting {
@ -62,14 +62,14 @@ void SVGPathPaintable::paint(PaintContext& context, PaintPhase phase) const
auto& geometry_element = layout_box().dom_node(); auto& geometry_element = layout_box().dom_node();
auto const* svg_element = geometry_element.shadow_including_first_ancestor_of_type<SVG::SVGSVGElement>(); auto const* svg_node = layout_box().first_ancestor_of_type<Layout::SVGSVGBox>();
auto svg_element_rect = svg_element->paintable_box()->absolute_rect(); auto svg_element_rect = svg_node->paintable_box()->absolute_rect();
// FIXME: This should not be trucated to an int. // FIXME: This should not be trucated to an int.
RecordingPainterStateSaver save_painter { context.recording_painter() }; RecordingPainterStateSaver save_painter { context.recording_painter() };
auto offset = context.floored_device_point(svg_element_rect.location()).to_type<int>().to_type<float>(); auto offset = context.floored_device_point(svg_element_rect.location()).to_type<int>().to_type<float>();
auto maybe_view_box = svg_element->view_box(); auto maybe_view_box = svg_node->dom_node().view_box();
auto paint_transform = computed_transforms().svg_to_device_pixels_transform(context); auto paint_transform = computed_transforms().svg_to_device_pixels_transform(context);
Gfx::Path path = computed_path()->copy_transformed(paint_transform); Gfx::Path path = computed_path()->copy_transformed(paint_transform);