Skip to content

Lightpanda: the headless browser designed for AI and automation

free WebDriver actionSequence resolver

Karl Seguin888d6fd52f41
diff --git a/src/browser/webapi/CSS.zig b/src/browser/webapi/CSS.zig
index 85de30ead..0df73dcad 100644
--- a/src/browser/webapi/CSS.zig
+++ b/src/browser/webapi/CSS.zig
@@ -29,27 +29,36 @@ pub fn parseDimension(value: []const u8) ?f64 {
if (value.len == 0) {
return null;
}
-
- var num_str = value;
- if (std.mem.endsWith(u8, value, "px")) {
- num_str = value[0 .. value.len - 2];
- }
-
- return std.fmt.parseFloat(f64, num_str) catch null;
+ return parseNonEmptyDimension(value);
}
// parseDimension plus viewport-relative units, which the faux layout
// resolves against the page viewport.
pub fn parseDimensionViewport(value: []const u8, frame: *Frame) ?f64 {
+ if (value.len == 0) {
+ return null;
+ }
+
if (std.mem.endsWith(u8, value, "vh")) {
const n = std.fmt.parseFloat(f64, value[0 .. value.len - 2]) catch return null;
return n * @as(f64, @floatFromInt(frame._page.getViewport().height)) / 100.0;
}
+
if (std.mem.endsWith(u8, value, "vw")) {
const n = std.fmt.parseFloat(f64, value[0 .. value.len - 2]) catch return null;
return n * @as(f64, @floatFromInt(frame._page.getViewport().width)) / 100.0;
}
- return parseDimension(value);
+
+ return parseNonEmptyDimension(value);
+}
+
+fn parseNonEmptyDimension(value: []const u8) ?f64 {
+ var num_str = value;
+ if (std.mem.endsWith(u8, value, "px")) {
+ num_str = value[0 .. value.len - 2];
+ }
+
+ return std.fmt.parseFloat(f64, num_str) catch null;
}
/// Escapes a CSS identifier string
diff --git a/src/browser/webapi/WebDriver.zig b/src/browser/webapi/WebDriver.zig
index 0aa6e3ae3..4ebe5e52e 100644
--- a/src/browser/webapi/WebDriver.zig
+++ b/src/browser/webapi/WebDriver.zig
@@ -105,7 +105,7 @@ pub fn actionSequence(_: *const WebDriver, sources: js.Value, frame: *Frame) !js
.sources = persisted,
.resolver = try resolver.persist(),
};
- errdefer action_sequence.sources.release();
+ errdefer action_sequence.resolver.release();
// cannot be run synchronously, has to be run on the next tick
try frame.js.scheduler.add(action_sequence, ActionSequence.run, 0, .{
@@ -131,6 +131,10 @@ const ActionSequence = struct {
frame.js.localScope(&ls);
defer ls.deinit();
+ errdefer |err| {
+ ls.toLocal(self.resolver).reject("WebDriver.actionSequence", ls.local.newString(@errorName(err)));
+ }
+
const sources = self.sources.local(&ls.local).toArray();
for (0..sources.len()) |i| {
const source_val = try sources.get(@intCast(i));
@@ -160,8 +164,7 @@ const ActionSequence = struct {
fn deinit(self: *ActionSequence) void {
self.sources.release();
- // The persisted resolver handle is page-managed; resetting it here
- // too would double-free the v8 global at page teardown.
+ self.resolver.release();
self.frame.releaseArena(self.arena);
}
};
diff --git a/src/browser/webapi/event/GamepadEvent.zig b/src/browser/webapi/event/GamepadEvent.zig
index f0423fec8..62fe4f75c 100644
--- a/src/browser/webapi/event/GamepadEvent.zig
+++ b/src/browser/webapi/event/GamepadEvent.zig
@@ -73,5 +73,5 @@ pub const JsApi = struct {
};
pub const constructor = bridge.constructor(GamepadEvent.init, .{});
- pub const gamepad = bridge.accessor(GamepadEvent.getGamepad, null, .{ .null_as_undefined = false });
+ pub const gamepad = bridge.accessor(GamepadEvent.getGamepad, null, .{});
};