Merge branch 'main' into agent

.github/workflows/release-agent.yml

@@ -110,4 +110,4 @@ jobs:
     steps:
       - name: cloudfront cache invalidation
         run: |
-          aws cloudfront create-invalidation --distribution-id ${{ env.AWS_CLOUDFRONT_DISTRIBUTION_ID }} --paths "/agent-nightly/*"
+          aws cloudfront create-invalidation --distribution-id ${{ env.AWS_CLOUDFRONT_DISTRIBUTION_ID }} --paths "/*"

src/TestHTTPServer.zig

@@ -81,8 +81,7 @@ fn handleConnection(self: *TestHTTPServer, conn: std.net.Server.Connection) !voi
 
     while (true) {
         var req = http_server.receiveHead() catch |err| switch (err) {
-            error.ReadFailed => continue,
-            error.HttpConnectionClosing => continue,
+            error.ReadFailed, error.HttpConnectionClosing => return,
             else => {
                 std.debug.print("Test HTTP Server error: {}\n", .{err});
                 return err;

src/browser/tests/element/position.html

@@ -63,6 +63,52 @@
 }
 </script>
 
+<script id="scrollMethods">
+{
+  const test3 = $('#test2');
+  test3.scrollTop = 0;
+  test3.scrollLeft = 0;
+
+  // scroll()/scrollTo() with (x, y) positional args
+  test3.scrollTo(30, 40);
+  testing.expectEqual(30, test3.scrollLeft);
+  testing.expectEqual(40, test3.scrollTop);
+
+  test3.scroll(5, 6);
+  testing.expectEqual(5, test3.scrollLeft);
+  testing.expectEqual(6, test3.scrollTop);
+
+  // scrollTo() with an options dictionary; omitted axes are left unchanged
+  test3.scrollTo({left: 11, top: 22});
+  testing.expectEqual(11, test3.scrollLeft);
+  testing.expectEqual(22, test3.scrollTop);
+
+  test3.scrollTo({top: 99});
+  testing.expectEqual(11, test3.scrollLeft); // unchanged
+  testing.expectEqual(99, test3.scrollTop);
+
+  // Negative values clamp to 0
+  test3.scrollTo(-10, -10);
+  testing.expectEqual(0, test3.scrollLeft);
+  testing.expectEqual(0, test3.scrollTop);
+
+  // scrollBy() is relative to the current position
+  test3.scrollTo(10, 10);
+  test3.scrollBy(5, 7);
+  testing.expectEqual(15, test3.scrollLeft);
+  testing.expectEqual(17, test3.scrollTop);
+
+  test3.scrollBy({left: -3, top: -2});
+  testing.expectEqual(12, test3.scrollLeft);
+  testing.expectEqual(15, test3.scrollTop);
+
+  // scrollBy() clamps to 0 and never goes negative
+  test3.scrollBy(-1000, -1000);
+  testing.expectEqual(0, test3.scrollLeft);
+  testing.expectEqual(0, test3.scrollTop);
+}
+</script>
+
 <script id="offsetDimensions">
 {
   const test1 = $('#test1');

src/browser/webapi/Element.zig

@@ -1502,6 +1502,50 @@ pub fn scrollIntoView(self: *Element, opts: ?ScrollIntoViewOpts, frame: *Frame)
     frame.window.scrollTo(.{ .x = 0 }, @intFromFloat(@max(0, y)), frame) catch {};
 }
 
+const ScrollToOpts = union(enum) {
+    x: i32,
+    opts: Opts,
+
+    const Opts = struct {
+        top: ?i32 = null,
+        left: ?i32 = null,
+        behavior: []const u8 = "",
+    };
+};
+
+pub fn scrollTo(self: *Element, opts: ?ScrollToOpts, y: ?i32, frame: *Frame) !void {
+    const o = opts orelse return;
+    const gop = try frame._element_scroll_positions.getOrPut(frame.arena, self);
+    if (!gop.found_existing) {
+        gop.value_ptr.* = .{};
+    }
+    switch (o) {
+        .x => |x| {
+            gop.value_ptr.x = @intCast(@max(0, x));
+            gop.value_ptr.y = @intCast(@max(0, y orelse 0));
+        },
+        .opts => |dict| {
+            if (dict.left) |left| gop.value_ptr.x = @intCast(@max(0, left));
+            if (dict.top) |top| gop.value_ptr.y = @intCast(@max(0, top));
+        },
+    }
+}
+
+// scrollBy(): like scrollTo() but relative to the current position.
+pub fn scrollBy(self: *Element, opts: ?ScrollToOpts, y: ?i32, frame: *Frame) !void {
+    const o = opts orelse return;
+    const gop = try frame._element_scroll_positions.getOrPut(frame.arena, self);
+    if (!gop.found_existing) {
+        gop.value_ptr.* = .{};
+    }
+    const dx: i32, const dy: i32 = switch (o) {
+        .x => |x| .{ x, y orelse 0 },
+        .opts => |dict| .{ dict.left orelse 0, dict.top orelse 0 },
+    };
+    gop.value_ptr.x = @intCast(@max(0, @as(i32, @intCast(gop.value_ptr.x)) + dx));
+    gop.value_ptr.y = @intCast(@max(0, @as(i32, @intCast(gop.value_ptr.y)) + dy));
+}
+
 pub fn format(self: *Element, writer: *std.Io.Writer) !void {
     try writer.writeByte('<');
     try writer.writeAll(self.getTagNameDump());
@@ -1916,6 +1960,9 @@ pub const JsApi = struct {
     pub const blur = bridge.function(Element.blur, .{});
     pub const scrollIntoView = bridge.function(Element.scrollIntoView, .{});
     pub const scrollIntoViewIfNeeded = bridge.function(Element.scrollIntoViewIfNeeded, .{});
+    pub const scroll = bridge.function(Element.scrollTo, .{});
+    pub const scrollTo = bridge.function(Element.scrollTo, .{});
+    pub const scrollBy = bridge.function(Element.scrollBy, .{});
 };
 
 pub const Build = struct {

src/cdp/testing.zig

@@ -48,6 +48,7 @@ const TestContext = struct {
     pub fn deinit(self: *TestContext) void {
         if (self.cdp_initialized) self.cdp_.deinit();
         posix.close(self.socket);
+        posix.close(self.cdp_socket);
         base.reset();
     }