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

LibWeb: Make Layout::SVGBox a BlockContainer again

Browse source 
This wasn't worth the headache of trying to make SVG boxes work together
with BFC right now. Let's just make it a block container once again, and
have its corresponding SVGPaintable inherit from PaintableWithLines.

We'll have to revisit this as SVG support improves.
This commit is contained in:
Andreas Kling 2022-03-12 14:13:25 +01:00
parent e4eb6d4f1f
commit aa969cc591
5 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibWeb/Layout/SVGBox.cpp
View file

@ -9,7 +9,7 @@
namespace Web::Layout { namespace Web::Layout {
SVGBox::SVGBox(DOM::Document& document, SVG::SVGElement& element, NonnullRefPtr<CSS::StyleProperties> style) SVGBox::SVGBox(DOM::Document& document, SVG::SVGElement& element, NonnullRefPtr<CSS::StyleProperties> style)
: Box(document, &element, move(style)) : BlockContainer(document, &element, move(style))
{ {
} }

2
Userland/Libraries/LibWeb/Layout/SVGBox.h
View file

@ -12,7 +12,7 @@
namespace Web::Layout { namespace Web::Layout {
class SVGBox : public Box { class SVGBox : public BlockContainer {
public: public:
SVGBox(DOM::Document&, SVG::SVGElement&, NonnullRefPtr<CSS::StyleProperties>); SVGBox(DOM::Document&, SVG::SVGElement&, NonnullRefPtr<CSS::StyleProperties>);
virtual ~SVGBox() override = default; virtual ~SVGBox() override = default;

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

@ -166,9 +166,10 @@ public:
virtual HitTestResult hit_test(Gfx::IntPoint const&, HitTestType) const override; virtual HitTestResult hit_test(Gfx::IntPoint const&, HitTestType) const override;
private: protected:
PaintableWithLines(Layout::BlockContainer const&); PaintableWithLines(Layout::BlockContainer const&);
private:
Vector<Layout::LineBox> m_line_boxes; Vector<Layout::LineBox> m_line_boxes;
}; };

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

@ -10,7 +10,7 @@
namespace Web::Painting { namespace Web::Painting {
SVGPaintable::SVGPaintable(Layout::SVGBox const& layout_box) SVGPaintable::SVGPaintable(Layout::SVGBox const& layout_box)
: PaintableBox(layout_box) : PaintableWithLines(layout_box)
{ {
} }

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

@ -11,7 +11,7 @@
namespace Web::Painting { namespace Web::Painting {
class SVGPaintable : public PaintableBox { class SVGPaintable : public PaintableWithLines {
public: public:
virtual void before_children_paint(PaintContext&, PaintPhase) const override; virtual void before_children_paint(PaintContext&, PaintPhase) const override;
virtual void after_children_paint(PaintContext&, PaintPhase) const override; virtual void after_children_paint(PaintContext&, PaintPhase) const override;