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

LibWeb: Add basic support for maskUnits=userSpaceOnUse

Browse source 
This still does not use the x, y, width, or height attributes on the
mask, but this allows at least displaying these masks.
This commit is contained in:
MacDue 2023-10-07 20:23:52 +01:00 • committed by Andreas Kling
parent 479451498b
commit 92fc426562
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Libraries/LibWeb/Painting/SVGGraphicsPaintable.cpp
View file

@ -8,6 +8,7 @@
#include <LibWeb/Painting/SVGGraphicsPaintable.h> #include <LibWeb/Painting/SVGGraphicsPaintable.h>
#include <LibWeb/Painting/StackingContext.h> #include <LibWeb/Painting/StackingContext.h>
#include <LibWeb/SVG/SVGMaskElement.h> #include <LibWeb/SVG/SVGMaskElement.h>
#include <LibWeb/SVG/SVGSVGElement.h>
namespace Web::Painting { namespace Web::Painting {
@ -35,9 +36,20 @@ Layout::SVGGraphicsBox const& SVGGraphicsPaintable::layout_box() const
Optional<CSSPixelRect> SVGGraphicsPaintable::get_masking_area() const Optional<CSSPixelRect> SVGGraphicsPaintable::get_masking_area() const
{ {
auto const& graphics_element = verify_cast<SVG::SVGGraphicsElement const>(*dom_node()); auto const& graphics_element = verify_cast<SVG::SVGGraphicsElement const>(*dom_node());
if (auto mask = graphics_element.mask()) auto mask = graphics_element.mask();
return mask->resolve_masking_area(absolute_border_box_rect()); if (!mask)
return {}; return {};
auto target_area = [&] {
auto mask_units = mask->mask_units();
if (mask_units == SVG::MaskUnits::UserSpaceOnUse) {
auto const* svg_element = graphics_element.shadow_including_first_ancestor_of_type<SVG::SVGSVGElement>();
return svg_element->paintable_box()->absolute_border_box_rect();
} else {
VERIFY(mask_units == SVG::MaskUnits::ObjectBoundingBox);
return absolute_border_box_rect();
}
}();
return mask->resolve_masking_area(target_area);
} }
static Gfx::Bitmap::MaskKind mask_type_to_gfx_mask_kind(CSS::MaskType mask_type) static Gfx::Bitmap::MaskKind mask_type_to_gfx_mask_kind(CSS::MaskType mask_type)

4
Userland/Libraries/LibWeb/SVG/SVGMaskElement.cpp
View file

@ -53,10 +53,6 @@ MaskUnits SVGMaskElement::mask_units() const
CSSPixelRect SVGMaskElement::resolve_masking_area(CSSPixelRect const& mask_target) const CSSPixelRect SVGMaskElement::resolve_masking_area(CSSPixelRect const& mask_target) const
{ {
if (mask_units() == SVG::MaskUnits::UserSpaceOnUse) {
dbgln("SVG: maskUnits=userSpaceOnUse is not supported");
return {};
}
// TODO: Resolve this based on the x, y, width, and height of the mask. // TODO: Resolve this based on the x, y, width, and height of the mask.
return mask_target.inflated(mask_target.size().scaled(CSSPixels(2) / 10)); return mask_target.inflated(mask_target.size().scaled(CSSPixels(2) / 10));
} }