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

LibWeb: Add non-const version of paintable_box() in Layout::Node

Browse source 
Allows to remove a bunch of const_cast's
This commit is contained in:
Aliaksandr Kalenik 2023-08-07 00:51:05 +02:00 • committed by Andreas Kling
parent dc08e9138c
commit 6868ace8f4
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Libraries/LibWeb/Layout/Box.cpp
View file

@ -77,6 +77,11 @@ JS::GCPtr<Painting::Paintable> Box::create_paintable() const
return Painting::PaintableBox::create(*this); return Painting::PaintableBox::create(*this);
} }
Painting::PaintableBox* Box::paintable_box()
{
return static_cast<Painting::PaintableBox*>(Node::paintable());
}
Painting::PaintableBox const* Box::paintable_box() const Painting::PaintableBox const* Box::paintable_box() const
{ {
return static_cast<Painting::PaintableBox const*>(Node::paintable()); return static_cast<Painting::PaintableBox const*>(Node::paintable());

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

@ -23,6 +23,7 @@ class Box : public NodeWithStyleAndBoxModelMetrics {
public: public:
Painting::PaintableBox const* paintable_box() const; Painting::PaintableBox const* paintable_box() const;
Painting::PaintableBox* paintable_box();
virtual void set_needs_display() override; virtual void set_needs_display() override;

10
Userland/Libraries/LibWeb/Layout/Viewport.cpp
View file

@ -33,24 +33,24 @@ void Viewport::build_stacking_context_tree_if_needed()
void Viewport::build_stacking_context_tree() void Viewport::build_stacking_context_tree()
{ {
const_cast<Painting::PaintableBox*>(paintable_box())->set_stacking_context(make<Painting::StackingContext>(*this, nullptr, 0)); paintable_box()->set_stacking_context(make<Painting::StackingContext>(*this, nullptr, 0));
size_t index_in_tree_order = 1; size_t index_in_tree_order = 1;
for_each_in_subtree_of_type<Box>([&](Box& box) { for_each_in_subtree_of_type<Box>([&](Box& box) {
if (!box.paintable_box()) if (!box.paintable_box())
return IterationDecision::Continue; return IterationDecision::Continue;
const_cast<Painting::PaintableBox*>(box.paintable_box())->invalidate_stacking_context(); box.paintable_box()->invalidate_stacking_context();
if (!box.establishes_stacking_context()) { if (!box.establishes_stacking_context()) {
VERIFY(!box.paintable_box()->stacking_context()); VERIFY(!box.paintable_box()->stacking_context());
return IterationDecision::Continue; return IterationDecision::Continue;
} }
auto* parent_context = const_cast<Painting::PaintableBox*>(box.paintable_box())->enclosing_stacking_context(); auto* parent_context = box.paintable_box()->enclosing_stacking_context();
VERIFY(parent_context); VERIFY(parent_context);
const_cast<Painting::PaintableBox*>(box.paintable_box())->set_stacking_context(make<Painting::StackingContext>(box, parent_context, index_in_tree_order++)); box.paintable_box()->set_stacking_context(make<Painting::StackingContext>(box, parent_context, index_in_tree_order++));
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
const_cast<Painting::PaintableBox*>(paintable_box())->stacking_context()->sort(); paintable_box()->stacking_context()->sort();
} }
void Viewport::paint_all_phases(PaintContext& context) void Viewport::paint_all_phases(PaintContext& context)