Lightpanda: the headless browser designed for AI and automation
chore: Change the lookup key for event listeners.
Karl Seguin56c9488ee780
diff --git a/src/browser/EventManagerBase.zig b/src/browser/EventManagerBase.zigindex fd26f8c09..ec4cfce46 100644--- a/src/browser/EventManagerBase.zig+++ b/src/browser/EventManagerBase.zig@@ -29,24 +29,6 @@ const log = lp.log;const String = lp.String;const Allocator = std.mem.Allocator;-const EventKey = struct {- event_target: usize,- type_string: String,-};--const EventKeyContext = struct {- pub fn hash(_: @This(), key: EventKey) u64 {- var hasher = std.hash.Wyhash.init(0);- hasher.update(std.mem.asBytes(&key.event_target));- hasher.update(key.type_string.str());- return hasher.final();- }-- pub fn eql(_: @This(), a: EventKey, b: EventKey) bool {- return a.event_target == b.event_target and a.type_string.eql(b.type_string);- }-};-// EventManagerBase provides core event listener management without DOM-specific// functionality. It handles listener registration, removal, and the basic dispatch// loop for non-propagating events.@@ -55,12 +37,8 @@ pub const EventManagerBase = @This();arena: Allocator,listener_pool: std.heap.MemoryPool(Listener),list_pool: std.heap.MemoryPool(std.DoublyLinkedList),-lookup: std.HashMapUnmanaged(- EventKey,- *std.DoublyLinkedList,- EventKeyContext,- std.hash_map.default_max_load_percentage,-),+// @intFromPtr(event_target) -> [{type, listener-linked-list}]+lookup: std.AutoHashMapUnmanaged(usize, std.ArrayList(TypeListeners)),dispatch_depth: usize,deferred_removals: std.ArrayList(struct { list: *std.DoublyLinkedList, listener: *Listener }),@@ -75,6 +53,11 @@ pub fn init(arena: Allocator) EventManagerBase {};}+const TypeListeners = struct {+ typ: String,+ list: *std.DoublyLinkedList,+};+pub const RegisterOptions = struct {once: bool = false,capture: bool = false,@@ -111,34 +94,39 @@ pub fn register(self: *EventManagerBase, target: *EventTarget, typ: []const u8,}}- // Allocate the type string we'll use in both listener and key- const type_string = try String.init(arena, typ, .{});-- const gop = try self.lookup.getOrPut(arena, .{- .type_string = type_string,- .event_target = @intFromPtr(target),- });- if (gop.found_existing) {- // check for duplicate callbacks already registered. Listeners that- // have been removed (e.g. a `once` listener that fired mid-dispatch- // and is awaiting destruction in deferred_removals) are not "in"- // the listener list per spec — skip them.- var node = gop.value_ptr.*.first;- while (node) |n| {- const listener: *Listener = @alignCast(@fieldParentPtr("node", n));- node = n.next;- if (listener.removed) continue;- const is_duplicate = switch (callback) {- .object => |obj| listener.function.eqlObject(obj),- .function => |func| listener.function.eqlFunction(func),- };- if (is_duplicate and listener.capture == opts.capture) {- return null;- }+ const gop = try self.lookup.getOrPut(arena, @intFromPtr(target));+ if (gop.found_existing == false) {+ gop.value_ptr.* = .empty;+ }+ const types = gop.value_ptr;++ const list, const type_string = blk: {+ if (findType(types.items, .wrap(typ))) |existing| {+ break :blk .{ existing.list, existing.typ };+ }+ const type_string = try String.init(arena, typ, .{});+ const list = try self.list_pool.create(arena);+ list.* = .{};+ try types.append(arena, .{ .typ = type_string, .list = list });+ break :blk .{ list, type_string };+ };++ // check for duplicate callbacks already registered. Listeners that+ // have been removed (e.g. a `once` listener that fired mid-dispatch+ // and is awaiting destruction in deferred_removals) are not "in"+ // the listener list per spec — skip them.+ var node = list.first;+ while (node) |n| {+ const listener: *Listener = @alignCast(@fieldParentPtr("node", n));+ node = n.next;+ if (listener.removed) continue;+ const is_duplicate = switch (callback) {+ .object => |obj| listener.function.eqlObject(obj),+ .function => |func| listener.function.eqlFunction(func),+ };+ if (is_duplicate and listener.capture == opts.capture) {+ return null;}- } else {- gop.value_ptr.* = try self.list_pool.create(arena);- gop.value_ptr.*.* = .{};}const func = switch (callback) {@@ -157,16 +145,13 @@ pub fn register(self: *EventManagerBase, target: *EventTarget, typ: []const u8,.typ = type_string,};// append the listener to the list of listeners for this target- gop.value_ptr.*.append(&listener.node);+ list.append(&listener.node);return listener;}pub fn remove(self: *EventManagerBase, target: *EventTarget, typ: []const u8, callback: Callback, use_capture: bool) void {- const list = self.lookup.get(.{- .type_string = .wrap(typ),- .event_target = @intFromPtr(target),- }) orelse return;+ const list = self.getListeners(target, .wrap(typ)) orelse return;if (findListener(list, callback, use_capture)) |listener| {self.removeListener(list, listener);}@@ -191,18 +176,23 @@ pub fn removeListener(self: *EventManagerBase, list: *std.DoublyLinkedList, list/// Check if there are any listeners registered for a target/type combination.fn hasListeners(self: *EventManagerBase, target: *EventTarget, typ: []const u8) bool {- return self.lookup.get(.{- .event_target = @intFromPtr(target),- .type_string = .wrap(typ),- }) != null;+ return self.getListeners(target, .wrap(typ)) != null;}/// Get the listener list for a target/type, if any exist.pub fn getListeners(self: *EventManagerBase, target: *EventTarget, event_type: String) ?*std.DoublyLinkedList {- return self.lookup.get(.{- .event_target = @intFromPtr(target),- .type_string = event_type,- });+ const types = self.lookup.get(@intFromPtr(target)) orelse return null;+ const entry = findType(types.items, event_type) orelse return null;+ return entry.list;+}++fn findType(types: []const TypeListeners, event_type: String) ?*const TypeListeners {+ for (types) |*entry| {+ if (entry.typ.eql(event_type)) {+ return entry;+ }+ }+ return null;}/// Whether the list still holds a listener, or one that can calldiff --git a/src/browser/interactive.zig b/src/browser/interactive.zigindex 3168abc89..5667fe989 100644--- a/src/browser/interactive.zig+++ b/src/browser/interactive.zig@@ -286,11 +286,12 @@ pub fn buildListenerTargetMap(frame: *Frame, arena: Allocator) !ListenerTargetMa// addEventListener registrationsvar it = frame._event_manager.base.lookup.iterator();while (it.next()) |entry| {- const list = entry.value_ptr.*;- if (list.first != null) {- const gop = try map.getOrPut(arena, entry.key_ptr.event_target);- if (!gop.found_existing) gop.value_ptr.* = .empty;- try gop.value_ptr.append(arena, entry.key_ptr.type_string.str());+ for (entry.value_ptr.items) |type_listeners| {+ if (type_listeners.list.first != null) {+ const gop = try map.getOrPut(arena, entry.key_ptr.*);+ if (!gop.found_existing) gop.value_ptr.* = .empty;+ try gop.value_ptr.append(arena, type_listeners.typ.str());+ }}}