Lightpanda: the headless browser designed for AI and automation
Merge pull request #4106 from lightpanda-io/id-map-count
Karl Seguinc7c78b59ed62
diff --cc src/browser/Frame.zigindex 00be794de,b3afa60da..a14f609fe--- a/src/browser/Frame.zig+++ b/src/browser/Frame.zig@@@ -3127,13 -3098,8 +3100,13 @@@ pub fn removeNode(self: *Frame, parentvar tw = TreeWalker.Full.Elements.init(child, .{});while (tw.next()) |el| {if (el.getId()) |id| {- self.removeElementIdWithMaps(old_id_maps.?, id);+ old_id_map.?.remove(el, id);}+ if (el.hostedShadowRoot(self)) |shadow| {+ shadow_roots.append(self.call_arena, shadow) catch |err| {+ log.err(.bug, "shadow.disconnect", .{ .err = err, .type = self._type, .url = self.url });+ };+ }Element.Html.Custom.enqueueDisconnectedCallbackOnElement(el, self);Element.Html.Custom.enqueueShadowTreeCallbacks(el, .disconnected, self) catch |err| {@@@ -3186,40 -3151,9 +3159,40 @@@ fn removeStyleSheet(owner: ?*Frame, shesheets.remove(sheet);}+fn disconnectShadowIFrames(self: *Frame, shadow_roots: *std.ArrayList(*ShadowRoot)) void {+ var iframes: std.ArrayList(*Node) = .empty;+ self.collectShadowIFrames(shadow_roots, &iframes) catch |err| {+ log.err(.bug, "shadow.disconnect", .{ .err = err, .type = self._type, .url = self.url });+ };+ for (iframes.items) |node| {+ const el = node.as(Element);+ IFrame.Build.disconnected(el, self) catch |err| {+ log.err(.bug, "build.disconnected", .{ .tag = el.getTag(), .err = err, .type = self._type, .url = self.url });+ };+ }+}++// TreeWalker doesn't enter a shadow trees. So when we connect/disconnect a+// subtree, this function lets us reach through it. `shadow_roots` is a list+// to visit (and we might discover new ones while visiting those).+fn collectShadowIFrames(self: *Frame, shadow_roots: *std.ArrayList(*ShadowRoot), out: *std.ArrayList(*Node)) !void {+ var i: usize = 0;+ while (i < shadow_roots.items.len) : (i += 1) {+ var tw = TreeWalker.FullExcludeSelf.Elements.init(shadow_roots.items[i].asNode(), .{});+ while (tw.next()) |el| {+ if (el.is(IFrame) != null) {+ try out.append(self.call_arena, el.asNode());+ }+ if (el.hostedShadowRoot(self)) |shadow| {+ try shadow_roots.append(self.call_arena, shadow);+ }+ }+ }+}+// The TreeWalker isn't shadow DOM aware, so this is correctly scoped to direct// descendants (ids nested under a shadow DOM are owned by that shadow DOM).- fn unregisterSubtreeIds(self: *Frame, node: *Node, id_maps: ElementIdMaps) void {+ fn unregisterSubtreeIds(node: *Node, id_map: *IdMap) void {var tw = TreeWalker.Full.Elements.init(node, .{});while (tw.next()) |el| {if (el.getId()) |id| {