Преглед на файлове

LibWeb: Make Layout::SVGBox a BlockContainer again

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.
Andreas Kling преди 3 години
родител
ревизия
aa969cc591

+ 1 - 1
Userland/Libraries/LibWeb/Layout/SVGBox.cpp

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

+ 1 - 1
Userland/Libraries/LibWeb/Layout/SVGBox.h

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

+ 2 - 1
Userland/Libraries/LibWeb/Painting/PaintableBox.h

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

+ 1 - 1
Userland/Libraries/LibWeb/Painting/SVGPaintable.cpp

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

+ 1 - 1
Userland/Libraries/LibWeb/Painting/SVGPaintable.h

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