Skip to content

Lightpanda: the headless browser designed for AI and automation

webapi: finish the exec -> frame parameter conversion in enumerators

Francis Bouviera00d06d2d8b4
diff --git a/src/browser/webapi/collections/HTMLCollection.zig b/src/browser/webapi/collections/HTMLCollection.zig
index 1dbeae894..fa6a71f32 100644
--- a/src/browser/webapi/collections/HTMLCollection.zig
+++ b/src/browser/webapi/collections/HTMLCollection.zig
@@ -229,13 +229,8 @@ pub const JsApi = struct {
// collection, in tree order, its id and (for HTML elements) its name
// attribute, skipping empty values and duplicates.
fn getNames(self: *HTMLCollection, frame: *Frame) !js.Array {
- const frame = switch (exec.js.global) {
- .frame => |f| f,
- .worker => unreachable,
- };
-
var names: std.ArrayList([]const u8) = .{};
- const arena = exec.local_arena;
+ const arena = frame.local_arena;
const len = self.length(frame);
for (0..len) |i| {
@@ -254,7 +249,7 @@ pub const JsApi = struct {
}
}
- var arr = exec.js.local.?.newArray(@intCast(names.items.len));
+ var arr = frame.js.local.?.newArray(@intCast(names.items.len));
for (names.items, 0..) |name, i| {
_ = try arr.set(@intCast(i), name, .{});
}
diff --git a/src/browser/webapi/element/Attribute.zig b/src/browser/webapi/element/Attribute.zig
index 727d66bb7..cd74b52b7 100644
--- a/src/browser/webapi/element/Attribute.zig
+++ b/src/browser/webapi/element/Attribute.zig
@@ -633,8 +633,8 @@ pub const NamedNodeMap = struct {
}
fn getNames(self: *const NamedNodeMap, frame: *Frame) !js.Array {
- const names = try self.list().getNames(exec.local_arena);
- var arr = exec.js.local.?.newArray(@intCast(names.len));
+ const names = try self.list().getNames(frame.local_arena);
+ var arr = frame.js.local.?.newArray(@intCast(names.len));
for (names, 0..) |name, i| {
_ = try arr.set(@intCast(i), name, .{});
}
diff --git a/src/browser/webapi/element/DOMStringMap.zig b/src/browser/webapi/element/DOMStringMap.zig
index f70263f46..397bdb7ab 100644
--- a/src/browser/webapi/element/DOMStringMap.zig
+++ b/src/browser/webapi/element/DOMStringMap.zig
@@ -139,11 +139,11 @@ pub const JsApi = struct {
// The supported property names are the camel-cased names of the
// element's data-* attributes, in attribute order.
- fn getNames(self: *DOMStringMap, exec: *const js.Execution) !js.Array {
+ fn getNames(self: *DOMStringMap, frame: *Frame) !js.Array {
var names: std.ArrayList([]const u8) = .empty;
- for (try self._element._attributes.getNames(exec.local_arena)) |attr_name| {
- const camel = (try kebabToCamel(exec.local_arena, attr_name)) orelse continue;
- try names.append(exec.local_arena, camel);
+ for (try self._element._attributes.getNames(frame.local_arena)) |attr_name| {
+ const camel = (try kebabToCamel(frame.local_arena, attr_name)) orelse continue;
+ try names.append(frame.local_arena, camel);
}
var arr = frame.js.local.?.newArray(@intCast(names.items.len));