mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-10-23 08:30:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibCore: Remove parent/child concept from EventReceiver

Browse source 
This ownership model is no longer used.
This commit is contained in:
Andreas Kling 2025-08-11 11:30:20 +02:00 • committed by Andreas Kling
commit 75091016d7
Notes: github-actions[bot] 2025-08-11 14:57:17 +00:00
2 changed files with 5 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

91
Libraries/LibCore/EventReceiver.cpp
View file

@ -14,26 +14,11 @@
namespace Core {
EventReceiver::EventReceiver(EventReceiver* parent)
: m_parent(parent)
{
if (m_parent)
m_parent->add_child(*this);
}
EventReceiver::EventReceiver() = default;
EventReceiver::~EventReceiver()
{
// NOTE: We move our children out to a stack vector to prevent other
// code from trying to iterate over them.
auto children = move(m_children);
// NOTE: We also unparent the children, so that they won't try to unparent
// themselves in their own destructors.
for (auto& child : children)
child->m_parent = nullptr;
stop_timer();
if (m_parent)
m_parent->remove_child(*this);
}
void EventReceiver::event(Core::Event& event)
@ -56,54 +41,6 @@ void EventReceiver::event(Core::Event& event)
}
}
ErrorOr<void> EventReceiver::try_add_child(EventReceiver& object)
{
// FIXME: Should we support reparenting objects?
VERIFY(!object.parent() || object.parent() == this);
TRY(m_children.try_append(object));
object.m_parent = this;
Core::ChildEvent child_event(Core::Event::ChildAdded, object);
event(child_event);
return {};
}
void EventReceiver::add_child(EventReceiver& object)
{
MUST(try_add_child(object));
}
void EventReceiver::insert_child_before(EventReceiver& new_child, EventReceiver& before_child)
{
// FIXME: Should we support reparenting objects?
VERIFY(!new_child.parent() || new_child.parent() == this);
new_child.m_parent = this;
m_children.insert_before_matching(new_child, [&](auto& existing_child) { return existing_child.ptr() == &before_child; });
Core::ChildEvent child_event(Core::Event::ChildAdded, new_child, &before_child);
event(child_event);
}
void EventReceiver::remove_child(EventReceiver& object)
{
for (size_t i = 0; i < m_children.size(); ++i) {
if (m_children[i] == &object) {
// NOTE: We protect the child so it survives the handling of ChildRemoved.
NonnullRefPtr<EventReceiver> protector = object;
object.m_parent = nullptr;
m_children.remove(i);
Core::ChildEvent child_event(Core::Event::ChildRemoved, object);
event(child_event);
return;
}
}
VERIFY_NOT_REACHED();
}
void EventReceiver::remove_all_children()
{
while (!m_children.is_empty())
m_children.first()->remove_from_parent();
}
void EventReceiver::timer_event(Core::TimerEvent&)
{
}
@ -139,35 +76,13 @@ void EventReceiver::deferred_invoke(Function<void()> invokee)
Core::deferred_invoke([invokee = move(invokee), strong_this = NonnullRefPtr(*this)] { invokee(); });
}
bool EventReceiver::is_ancestor_of(EventReceiver const& other) const
void EventReceiver::dispatch_event(Core::Event& e)
{
if (&other == this)
return false;
for (auto* ancestor = other.parent(); ancestor; ancestor = ancestor->parent()) {
if (ancestor == this)
return true;
}
return false;
}
void EventReceiver::dispatch_event(Core::Event& e, EventReceiver* stay_within)
{
VERIFY(!stay_within || stay_within == this || stay_within->is_ancestor_of(*this));
auto* target = this;
do {
target->event(e);
target = target->parent();
if (target == stay_within) {
// Prevent the event from bubbling any further.
return;
}
} while (target && !e.is_accepted());
event(e);
}
bool EventReceiver::is_visible_for_timer_purposes() const
{
if (parent())
return parent()->is_visible_for_timer_purposes();
return true;
}