Skip to content

Lightpanda: the headless browser designed for AI and automation

use window frame (if available)

Karl Seguinb104e5c9ee56
diff --git a/src/browser/tests/frames/cross_realm_listeners.html b/src/browser/tests/frames/cross_realm_listeners.html
index c05ae3153..1d6c2b85e 100644
--- a/src/browser/tests/frames/cross_realm_listeners.html
+++ b/src/browser/tests/frames/cross_realm_listeners.html
@@ -59,6 +59,27 @@
});
</script>
+<script id=dispatch_on_child_window>
+ testing.onload(() => {
+ const cw = $('#f1').contentWindow;
+
+ // The parent's dispatchEvent on the child's window: it dispatches in the
+ // child's frame, so the child's window.event is the event.
+ const e = new Event('wping');
+ let child_event = null;
+ let parent_event = null;
+ const listener = () => {
+ child_event = cw.event;
+ parent_event = window.event;
+ };
+ cw.addEventListener('wping', listener);
+ EventTarget.prototype.dispatchEvent.call(cw, e);
+ testing.expectEqual(true, child_event === e);
+ testing.expectEqual(undefined, parent_event);
+ cw.removeEventListener('wping', listener);
+ });
+</script>
+
<script id=window_listeners_dropped_on_navigation type=module>
const state = await testing.async();
diff --git a/src/browser/webapi/EventTarget.zig b/src/browser/webapi/EventTarget.zig
index 6f0e7279b..a2714197b 100644
--- a/src/browser/webapi/EventTarget.zig
+++ b/src/browser/webapi/EventTarget.zig
@@ -21,6 +21,7 @@ const lp = @import("lightpanda");
const js = @import("../js/js.zig");
const Page = @import("../Page.zig");
+const Frame = @import("../Frame.zig");
const Factory = @import("../Factory.zig");
const EventManager = @import("../EventManager.zig");
@@ -191,11 +192,15 @@ pub fn dispatchEvent(self: *EventTarget, event: *Event, exec: *js.Execution) !bo
switch (exec.js.global) {
.frame => |caller| {
- // a Node's event disaptches in its own frame. It doens't matter
- // where dispatchEvent was called.
- const frame = blk: {
- const node = self.is(Node) orelse break :blk caller;
- break :blk node.ownerFrame(caller) orelse caller;
+ // a Node's or Window's event disaptches in its own frame. It
+ // doens't matter where dispatchEvent was called.
+ const frame: *Frame = switch (self._type) {
+ .node => self.subtype(Node).ownerFrame(caller) orelse caller,
+ .window => blk: {
+ const window = self.subtype(Window);
+ break :blk if (window._closed) caller else window._frame;
+ },
+ else => caller,
};
event.acquireRef();
defer _ = event.releaseRef(frame.page);