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

LibWeb: Treate SVG paintable coordinates as relative to <svg> element

Browse source 
Normally, paintable coordinates are relative to the nearest containing
block, but in the SVG case, since <svg> doesn't form a containing block,
we have to specialize the computation of SVGPaintable::absolute_rect().
This commit is contained in:
Andreas Kling 2022-03-24 16:06:43 +01:00
parent 88aca4c996
commit d5aca1c6c4
4 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Libraries/LibWeb/Painting/PaintableBox.cpp
View file

@ -66,14 +66,18 @@ Gfx::FloatPoint PaintableBox::effective_offset() const
return m_offset; return m_offset;
} }
Gfx::FloatRect PaintableBox::absolute_rect() const Gfx::FloatRect PaintableBox::compute_absolute_rect() const
{ {
if (!m_absolute_rect.has_value()) {
Gfx::FloatRect rect { effective_offset(), content_size() }; Gfx::FloatRect rect { effective_offset(), content_size() };
for (auto const* block = containing_block(); block && block->paintable(); block = block->paintable()->containing_block()) for (auto const* block = containing_block(); block && block->paintable(); block = block->paintable()->containing_block())
rect.translate_by(block->paint_box()->effective_offset()); rect.translate_by(block->paint_box()->effective_offset());
m_absolute_rect = rect; return rect;
} }
Gfx::FloatRect PaintableBox::absolute_rect() const
{
if (!m_absolute_rect.has_value())
m_absolute_rect = compute_absolute_rect();
return *m_absolute_rect; return *m_absolute_rect;
} }

2
Userland/Libraries/LibWeb/Painting/PaintableBox.h
View file

@ -126,6 +126,8 @@ protected:
virtual void paint_background(PaintContext&) const; virtual void paint_background(PaintContext&) const;
virtual void paint_box_shadow(PaintContext&) const; virtual void paint_box_shadow(PaintContext&) const;
virtual Gfx::FloatRect compute_absolute_rect() const;
private: private:
Painting::BorderRadiusData normalized_border_radius_data() const; Painting::BorderRadiusData normalized_border_radius_data() const;

12
Userland/Libraries/LibWeb/Painting/SVGPaintable.cpp
View file

@ -5,6 +5,7 @@
*/ */
#include <LibWeb/Layout/ImageBox.h> #include <LibWeb/Layout/ImageBox.h>
#include <LibWeb/Layout/SVGSVGBox.h>
#include <LibWeb/Painting/SVGPaintable.h> #include <LibWeb/Painting/SVGPaintable.h>
namespace Web::Painting { namespace Web::Painting {
@ -35,4 +36,15 @@ void SVGPaintable::after_children_paint(PaintContext& context, PaintPhase phase)
context.svg_context().restore(); context.svg_context().restore();
} }
Gfx::FloatRect SVGPaintable::compute_absolute_rect() const
{
if (auto* svg_svg_box = layout_box().first_ancestor_of_type<Layout::SVGSVGBox>()) {
Gfx::FloatRect rect { effective_offset(), content_size() };
for (Layout::Box const* ancestor = svg_svg_box; ancestor && ancestor->paintable(); ancestor = ancestor->paintable()->containing_block())
rect.translate_by(ancestor->paint_box()->effective_offset());
return rect;
}
return PaintableBox::compute_absolute_rect();
}
} }

2
Userland/Libraries/LibWeb/Painting/SVGPaintable.h
View file

@ -20,6 +20,8 @@ public:
protected: protected:
SVGPaintable(Layout::SVGBox const&); SVGPaintable(Layout::SVGBox const&);
virtual Gfx::FloatRect compute_absolute_rect() const override;
}; };
} }