Skip to content

Lightpanda: the headless browser designed for AI and automation

split IO reset and disconnect

Karl Seguinbb9f9b36e9ad
diff --git a/src/browser/frame/observers.zig b/src/browser/frame/observers.zig
index 655fa1c9b..58b884c63 100644
--- a/src/browser/frame/observers.zig
+++ b/src/browser/frame/observers.zig
@@ -341,14 +341,11 @@ fn disconnectRunawayIntersectionObservers(frame: *Frame) void {
log.err(.frame, "frame.IntersectionRunaway", .{ .type = frame._type, .url = frame.url });
}
- var i = frame._intersection.observers.items.len;
- while (i > 0) {
- i -= 1;
- if (i >= frame._intersection.observers.items.len) {
- continue;
- }
- frame._intersection.observers.items[i].disconnect(frame);
+ for (frame._intersection.observers.items) |observer| {
+ observer.reset(frame._page);
+ observer.releaseRef(frame._page);
}
+ frame._intersection.observers.clearRetainingCapacity();
}
pub fn deliverIntersections(frame: *Frame) void {
diff --git a/src/browser/webapi/IntersectionObserver.zig b/src/browser/webapi/IntersectionObserver.zig
index 5fcd697e8..ae4758c88 100644
--- a/src/browser/webapi/IntersectionObserver.zig
+++ b/src/browser/webapi/IntersectionObserver.zig
@@ -172,17 +172,22 @@ pub fn unobserve(self: *IntersectionObserver, target: *Element, frame: *Frame) v
}
}
-pub fn disconnect(self: *IntersectionObserver, frame: *Frame) void {
+// Drops every observation without touching the frame's observer list
+pub fn reset(self: *IntersectionObserver, page: *Page) void {
for (self._pending_entries.items) |entry| {
- entry.deinit(frame._page);
+ entry.deinit(page);
}
self._pending_entries.clearRetainingCapacity();
self._tracked.clearRetainingCapacity();
+ self._observing.clearRetainingCapacity();
+}
- if (self._observing.items.len > 0) {
+pub fn disconnect(self: *IntersectionObserver, frame: *Frame) void {
+ const registered = self._observing.items.len > 0;
+ self.reset(frame._page);
+ if (registered) {
Frame.observers.unregisterIntersectionObserver(frame, self);
}
- self._observing.clearRetainingCapacity();
}
pub fn takeRecords(self: *IntersectionObserver, frame: *Frame) ![]*IntersectionObserverEntry {