Skip to content

Lightpanda: the headless browser designed for AI and automation

perf: optimize (skip) element-targeted load event

Karl Seguin9ebc613cbe92
diff --git a/src/browser/EventManager.zig b/src/browser/EventManager.zig
index 1b114d17d..78dbe0563 100644
--- a/src/browser/EventManager.zig
+++ b/src/browser/EventManager.zig
@@ -113,6 +113,15 @@ fn noteListener(self: *EventManager, target: *EventTarget, listener: *const List
if (target._type == .node and listener.typ.eql(comptime .wrap("load"))) {
// optimization so that we avoid firing load for things (e.g. images)
// if there's no load listener regsitered (which is pretty common).
+ switch (listener.function) {
+ .handler, .handler_source => {
+ // Handlers are non-capture and load never bubbles. We don't
+ // need to set the frame-wide has_dom_load_listener. Instead, we
+ // can check this element eplicitly.
+ return;
+ },
+ .value, .object => {},
+ }
// A frameless document's node (createHTMLDocument, DOMParser) can be
// adopted into the caller's document later and load there.
const owner = target.subtype(Node).ownerFrame(self.frame) orelse self.frame;
@@ -176,6 +185,10 @@ pub fn hasDirectListeners(self: *EventManager, target: *EventTarget, typ: []cons
return self.base.hasDirectListeners(target, typ);
}
+pub fn hasHandler(self: *EventManager, target: *EventTarget, typ: []const u8) bool {
+ return self.base.hasHandler(target, typ);
+}
+
fn dispatchNode(self: *EventManager, target: *Node, event: *Event) !void {
const target_et = target.asEventTarget();
event._target = target_et;
diff --git a/src/browser/EventManagerBase.zig b/src/browser/EventManagerBase.zig
index 187a2c2a4..7197dfed6 100644
--- a/src/browser/EventManagerBase.zig
+++ b/src/browser/EventManagerBase.zig
@@ -431,6 +431,11 @@ pub fn hasDirectListeners(self: *EventManagerBase, target: *EventTarget, typ: []
return self.hasListeners(target, typ);
}
+pub fn hasHandler(self: *EventManagerBase, target: *EventTarget, typ: []const u8) bool {
+ const list = self.getListeners(target, .wrap(typ)) orelse return false;
+ return findHandler(list) != null;
+}
+
fn findListener(list: *const std.DoublyLinkedList, callback: Callback, capture: bool) ?*Listener {
var node = list.first;
while (node) |n| {
diff --git a/src/browser/Frame.zig b/src/browser/Frame.zig
index b7a890d79..941bc863d 100644
--- a/src/browser/Frame.zig
+++ b/src/browser/Frame.zig
@@ -2818,7 +2818,7 @@ fn dispatchQueuedEvents(self: *Frame) !void {
const element = html_element.asElement();
switch (queued.kind) {
.load => {
- if (has_dom_load_listener) {
+ if (has_dom_load_listener or self._event_manager.hasHandler(element.asEventTarget(), "load")) {
try self.fireElementEvent(element, comptime .wrap("load"));
}
},
@@ -4434,6 +4434,18 @@ test "Frame: cancelling navigation does not revive an aborted parser" {
try testing.expectEqual(null, frame.document._script_created_parser);
}
+test "Frame: an onload handler does not dispatch load to other elements" {
+ const page = try testing.pageTest("fixtures/load_handler_only.html", .{});
+ defer page.close();
+
+ const frame = page.frame().?;
+ try testing.expectString("attr;prop;", (try frame.getTitle()).?);
+ try testing.expectEqual(false, frame._event_manager.has_dom_load_listener);
+
+ const none = frame.document.getElementById("none", frame).?;
+ try testing.expectEqual(false, frame._event_manager.hasHandler(none.asEventTarget(), "load"));
+}
+
test "Frame: static immediate meta refresh navigates" {
const page = try testing.pageTest("fixtures/meta_refresh.html", .{});
defer page.close();
diff --git a/src/browser/tests/fixtures/load_handler_only.html b/src/browser/tests/fixtures/load_handler_only.html
new file mode 100644
index 000000000..c99d2f674
--- /dev/null
+++ b/src/browser/tests/fixtures/load_handler_only.html
@@ -0,0 +1,6 @@
+<!doctype html>
+<title></title>
+<img id="attr" src="a.png" onload="document.title += 'attr;'">
+<img id="none" src="b.png">
+<img id="prop" src="c.png">
+<script>document.getElementById('prop').onload = () => document.title += 'prop;';</script>