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

LibWeb: Make Layout::Node::paint() pure virtual

Browse source 
In the past, the base class implementation of this was used to descend
into subtrees and paint children. That is now taken care of by
StackingContext::paint_descendants() instead, and nothing used this.
This commit is contained in:
Andreas Kling 2021-09-15 14:53:44 +02:00
parent eac31e21f2
commit 28fabd4728
6 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibWeb/Layout/BreakNode.cpp
View file

@ -26,4 +26,8 @@ void BreakNode::split_into_lines(InlineFormattingContext& context, LayoutMode)
line_box.add_fragment(*this, 0, 0, 0, context.containing_block().line_height()); line_box.add_fragment(*this, 0, 0, 0, context.containing_block().line_height());
} }
void BreakNode::paint(PaintContext&, PaintPhase)
{
}
} }

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

@ -19,6 +19,8 @@ public:
const HTML::HTMLBRElement& dom_node() const { return verify_cast<HTML::HTMLBRElement>(*Node::dom_node()); } const HTML::HTMLBRElement& dom_node() const { return verify_cast<HTML::HTMLBRElement>(*Node::dom_node()); }
private: private:
virtual void paint(PaintContext&, PaintPhase) override;
virtual void split_into_lines(InlineFormattingContext&, LayoutMode) override; virtual void split_into_lines(InlineFormattingContext&, LayoutMode) override;
}; };

14
Userland/Libraries/LibWeb/Layout/Node.cpp
View file

@ -83,20 +83,6 @@ bool Node::establishes_stacking_context() const
return false; return false;
} }
void Node::paint(PaintContext& context, PaintPhase phase)
{
if (!is_visible())
return;
before_children_paint(context, phase);
for_each_child_in_paint_order([&](auto& child) {
child.paint(context, phase);
});
after_children_paint(context, phase);
}
HitTestResult Node::hit_test(const Gfx::IntPoint& position, HitTestType type) const HitTestResult Node::hit_test(const Gfx::IntPoint& position, HitTestType type) const
{ {
HitTestResult result; HitTestResult result;

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

@ -92,7 +92,7 @@ public:
virtual bool handle_mousewheel(Badge<EventHandler>, const Gfx::IntPoint&, unsigned buttons, unsigned modifiers, int wheel_delta); virtual bool handle_mousewheel(Badge<EventHandler>, const Gfx::IntPoint&, unsigned buttons, unsigned modifiers, int wheel_delta);
virtual void before_children_paint(PaintContext&, PaintPhase) {}; virtual void before_children_paint(PaintContext&, PaintPhase) {};
virtual void paint(PaintContext&, PaintPhase); virtual void paint(PaintContext&, PaintPhase) = 0;
virtual void paint_fragment(PaintContext&, const LineBoxFragment&, PaintPhase) const { } virtual void paint_fragment(PaintContext&, const LineBoxFragment&, PaintPhase) const { }
virtual void after_children_paint(PaintContext&, PaintPhase) {}; virtual void after_children_paint(PaintContext&, PaintPhase) {};

4
Userland/Libraries/LibWeb/Layout/TextNode.cpp
View file

@ -414,4 +414,8 @@ Optional<TextNode::Chunk> TextNode::ChunkIterator::try_commit_chunk(Utf8View::It
return {}; return {};
} }
void TextNode::paint(PaintContext&, PaintPhase)
{
}
} }

1
Userland/Libraries/LibWeb/Layout/TextNode.h
View file

@ -63,6 +63,7 @@ private:
void split_into_lines_by_rules(InlineFormattingContext&, LayoutMode, bool do_collapse, bool do_wrap_lines, bool do_respect_linebreaks); void split_into_lines_by_rules(InlineFormattingContext&, LayoutMode, bool do_collapse, bool do_wrap_lines, bool do_respect_linebreaks);
void paint_cursor_if_needed(PaintContext&, const LineBoxFragment&) const; void paint_cursor_if_needed(PaintContext&, const LineBoxFragment&) const;
void paint_text_decoration(Gfx::Painter&, LineBoxFragment const&) const; void paint_text_decoration(Gfx::Painter&, LineBoxFragment const&) const;
virtual void paint(PaintContext&, PaintPhase) override;
String m_text_for_rendering; String m_text_for_rendering;
}; };