dmaax/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LibWeb: Store document intersection observers weakly

Browse source 
Use GC::WeakHashSet for the registry instead of IGNORE_GC. The notify
and layout update paths now snapshot the live weak entries into
RootVector before iterating, preserving the existing protection against
mutation while avoiding an unvisited strong GC container field.
This commit is contained in:
Aliaksandr Kalenik 2026-05-25 04:29:35 +02:00 committed by Andreas Kling
parent 35b582048e
commit d149e55ff8
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Libraries/LibWeb/DOM/Document.cpp
View file

@ -5857,8 +5857,8 @@ void Document::inform_all_viewport_clients_about_the_current_viewport_rect()
void Document::register_intersection_observer(Badge<IntersectionObserver::IntersectionObserver>, IntersectionObserver::IntersectionObserver& observer)
{
auto result = m_intersection_observers.set(observer);
VERIFY(result == AK::HashSetResult::InsertedNewEntry);
VERIFY(!m_intersection_observers.contains(observer));
m_intersection_observers.set(observer);
}
void Document::unregister_intersection_observer(Badge<IntersectionObserver::IntersectionObserver>, IntersectionObserver::IntersectionObserver& observer)
@ -5900,7 +5900,9 @@ void Document::queue_intersection_observer_task()
m_intersection_observer_task_queued = false;
// 2. Let notify list be a list of all IntersectionObservers whose root is in the DOM tree of document.
auto notify_list = GC::RootVector { m_intersection_observers.values() };
GC::RootVector<GC::Ref<IntersectionObserver::IntersectionObserver>> notify_list;
for (auto& observer : m_intersection_observers)
notify_list.append(observer);
// 3. For each IntersectionObserver object observer in notify list, run these steps:
for (auto& observer : notify_list) {
@ -6014,7 +6016,9 @@ void Document::run_the_update_intersection_observations_steps(HighResolutionTime
// 2. For each observer in observer list:
// NOTE: We make a copy of the intersection observers list to avoid modifying it while iterating.
auto intersection_observers = GC::RootVector { m_intersection_observers.values() };
GC::RootVector<GC::Ref<IntersectionObserver::IntersectionObserver>> intersection_observers;
for (auto& observer : m_intersection_observers)
intersection_observers.append(observer);
update_paint_and_hit_testing_properties_if_needed();

2
Libraries/LibWeb/DOM/Document.h
View file

@ -1403,7 +1403,7 @@ private:
GC::Ptr<CSS::VisualViewport> m_visual_viewport;
// NOTE: Not in the spec per se, but Document must be able to access all IntersectionObservers whose root is in the document.
IGNORE_GC OrderedHashTable<GC::Ref<IntersectionObserver::IntersectionObserver>> m_intersection_observers;
GC::WeakHashSet<IntersectionObserver::IntersectionObserver> m_intersection_observers;
// https://www.w3.org/TR/intersection-observer/#document-intersectionobservertaskqueued
// Each document has an IntersectionObserverTaskQueued flag which is initialized to false.