Lightpanda: the headless browser designed for AI and automation
chore: rename Frame.arena -> Frame.page_arena
Karl Seguined29976f0568
diff --git a/src/browser/Frame.zig b/src/browser/Frame.zigindex 4b5858f17..caebbfc70 100644--- a/src/browser/Frame.zig+++ b/src/browser/Frame.zig@@ -277,8 +277,10 @@ buf: [BUF_SIZE]u8 = undefined,// access to the JavaScript enginejs: *JS.Context,-// An arena for the lifetime of the frame.-arena: Allocator,+// The Page's arena (page.arena), NOT one tied to this Frame. An iframe or+// popup that re-navigates is torn down and re-initialized in place while the+// Page lives on, and much of what's allocated here must survive.+page_arena: Allocator,// An arena with a lifetime for at least the scope of one Zig invocation from// JS. Prefer local_arena where possible. Use call_arena when allocations may@@ -359,13 +361,13 @@ pub fn init(self: *Frame, frame_id: u32, page: *Page, opts: InitOpts) !void {._proto = undefined,})).asDocument();- const arena = page.frame_arena;+ const page_arena = page.arena;const loader_id = session.nextLoaderId();self.* = .{.js = undefined,.page = page,- .arena = arena,+ .page_arena = page_arena,.parent = parent,.document = document,.window = undefined,@@ -382,8 +384,8 @@ pub fn init(self: *Frame, frame_id: u32, page: *Page, opts: InitOpts) !void {._type = if (parent == null) .root else .frame,._style_manager = undefined,._script_manager = undefined,- ._ce_reactions = .{ .allocator = arena },- ._event_manager = EventManager.init(arena, self),+ ._ce_reactions = .{ .allocator = page_arena },+ ._event_manager = EventManager.init(page_arena, self),._http_owner = undefined,};self._queued_events = &self._queued_events_1;@@ -408,7 +410,7 @@ pub fn init(self: *Frame, frame_id: u32, page: *Page, opts: InitOpts) !void {._proto = undefined,._document = self.document,._location = undefined,- ._performance = try .init(factory, arena),+ ._performance = try .init(factory, page_arena),._screen = screen,._visual_viewport = visual_viewport,._cross_origin_wrapper = undefined,@@ -435,7 +437,7 @@ pub fn init(self: *Frame, frame_id: u32, page: *Page, opts: InitOpts) !void {self.js = try browser.env.createContext(self, .{.identity = &page.identity,- .identity_arena = arena,+ .identity_arena = page_arena,.call_arena = self.call_arena,.local_arena = self.local_arena,});@@ -581,7 +583,7 @@ pub fn viewportChanged(self: *Frame) void {}pub fn trackWorker(self: *Frame, worker: *Worker) !void {- try self.workers.append(self.arena, worker);+ try self.workers.append(self.page_arena, worker);}pub fn removeWorker(self: *Frame, worker: *Worker) void {@@ -741,7 +743,7 @@ pub fn navigate(self: *Frame, request_url: [:0]const u8, opts: NavigateOpts) !voelse if (is_srcdoc)"about:srcdoc"else- try self.arena.dupeSentinel(u8, request_url, 0);+ try self.page_arena.dupeSentinel(u8, request_url, 0);self._requested_url = self.url;// even though about:blank navigations may share the same _data_, we@@ -756,7 +758,7 @@ pub fn navigate(self: *Frame, request_url: [:0]const u8, opts: NavigateOpts) !voif (is_blob) {// strip out blob:- self.origin = try URL.getOrigin(self.arena, request_url[5.. :0]);+ self.origin = try URL.getOrigin(self.page_arena, request_url[5.. :0]);} else if (self.parent) |parent| {self.origin = parent.origin;if (is_about_blank or is_srcdoc) {@@ -871,19 +873,19 @@ pub fn navigate(self: *Frame, request_url: [:0]const u8, opts: NavigateOpts) !voself.url = blk: {if (URL.isCompleteHTTPUrl(request_url)) {- break :blk try self.arena.dupeSentinel(u8, request_url, 0);+ break :blk try self.page_arena.dupeSentinel(u8, request_url, 0);}- break :blk try std.mem.concatWithSentinel(self.arena, u8, &.{ "http://", request_url }, 0);+ break :blk try std.mem.concatWithSentinel(self.page_arena, u8, &.{ "http://", request_url }, 0);};self._requested_url = self.url;- self.origin = try URL.getOrigin(self.arena, self.url);+ self.origin = try URL.getOrigin(self.page_arena, self.url);self._navigated_options = .{.cdp_id = opts.cdp_id,.reason = opts.reason,.method = opts.method,- .body = if (opts.body) |b| try self.arena.dupe(u8, b) else null,- .header = if (opts.header) |h| try self.arena.dupeSentinel(u8, h, 0) else null,+ .body = if (opts.body) |b| try self.page_arena.dupe(u8, b) else null,+ .header = if (opts.header) |h| try self.page_arena.dupeSentinel(u8, h, 0) else null,};const transfer = try http_client.newRequest(.{@@ -924,7 +926,7 @@ pub fn navigate(self: *Frame, request_url: [:0]const u8, opts: NavigateOpts) !vo}if (opts.referer) |ref| {try transfer.setHeader("Referer", ref, .{});- self._referrer = try self.arena.dupe(u8, ref);+ self._referrer = try self.page_arena.dupe(u8, ref);transfer.req.referrer_policy = opts.referrer_policy;}}@@ -1048,7 +1050,7 @@ fn scheduleNavigationWithArena(originator: *Frame, arena: *lp.Arena, request_url}const old_url = target.url;- target.url = try target.arena.dupeSentinel(u8, resolved_url, 0);+ target.url = try target.page_arena.dupeSentinel(u8, resolved_url, 0);const location = try Location.init(target.url, target);location.acquireRef();@@ -1504,8 +1506,8 @@ fn frameHeaderDoneCallback(transfer: *HttpClient.Transfer) !HttpClient.Transfer.const response_url = transfer.req.url;if (std.mem.eql(u8, response_url, self.url) == false) {// would be different than self.url in the case of a redirect- self.url = try self.arena.dupeSentinel(u8, response_url, 0);- self.origin = try URL.getOrigin(self.arena, self.url);+ self.url = try self.page_arena.dupeSentinel(u8, response_url, 0);+ self.origin = try URL.getOrigin(self.page_arena, self.url);}if (self.parent != null and framing.allowed(self, transfer) == false) {@@ -1532,7 +1534,7 @@ fn frameHeaderDoneCallback(transfer: *HttpClient.Transfer) !HttpClient.Transfer.// The Referer may have been recomputed at each hop; document.referrer// reports what the final request actually sent.self._referrer = if (transfer.findRequestHeader("referer")) |ref|- try self.arena.dupe(u8, ref)+ try self.page_arena.dupe(u8, ref)elsenull;}@@ -1555,9 +1557,9 @@ fn frameHeaderDoneCallback(transfer: *HttpClient.Transfer) !HttpClient.Transfer.self._http_status = transfer.responseStatus();self._bot_challenge = transfer.botChallenge();for (transfer.responseHeaders()) |hdr| {- try self._http_headers.append(self.arena, .{- .name = try self.arena.dupe(u8, hdr.name),- .value = try self.arena.dupe(u8, hdr.value),+ try self._http_headers.append(self.page_arena, .{+ .name = try self.page_arena.dupe(u8, hdr.name),+ .value = try self.page_arena.dupe(u8, hdr.value),});if (std.mem.eql(u8, hdr.name, "referrer-policy")) {if (referrer.parseHeader(hdr.value)) |rp| {@@ -1623,15 +1625,15 @@ fn maybeStartDownload(self: *Frame, transfer: *HttpClient.Transfer) !bool {// downloadWillBegin / downloadProgress events to one download.var guid_buf: [36]u8 = undefined;uuidv4(&guid_buf);- const guid = try self.arena.dupe(u8, &guid_buf);+ const guid = try self.page_arena.dupe(u8, &guid_buf);// Content-Disposition filenames can be in a legacy encoding (e.g.// Shift_JIS) but must yield valid UTF-8- const suggested = dispositionFilename(disposition) orelse (try urlBasename(self.arena, self.url)) orelse guid;+ const suggested = dispositionFilename(disposition) orelse (try urlBasename(self.page_arena, self.url)) orelse guid;const suggested_filename = if (std.unicode.utf8ValidateSlice(suggested))- try self.arena.dupe(u8, suggested)+ try self.page_arena.dupe(u8, suggested)else- try latin1ToUtf8(self.arena, suggested);+ try latin1ToUtf8(self.page_arena, suggested);// allowAndName stores the file under its guid; allow uses the suggested name.const on_disk_name = switch (session.download_behavior) {@@ -1785,7 +1787,7 @@ fn frameDataCallback(transfer: *HttpClient.Transfer, data: []const u8) !void {const end = std.mem.findScalarPos(u8, ct, 0, ';') orelse ct.len;const essence = std.mem.trim(u8, ct[0..end], " \t");if (essence.len > 0) {- self._pending_content_type = try std.ascii.allocLowerString(self.arena, essence);+ self._pending_content_type = try std.ascii.allocLowerString(self.page_arena, essence);}}}@@ -1806,7 +1808,7 @@ fn frameDataCallback(transfer: *HttpClient.Transfer, data: []const u8) !void {},.application_json, .text_javascript, .text_css, .text_plain, .text_markdown => {var arr: std.ArrayList(u8) = .empty;- try arr.appendSlice(self.arena, "<html><head><meta charset=\"utf-8\"></head><body><pre>");+ try arr.appendSlice(self.page_arena, "<html><head><meta charset=\"utf-8\"></head><body><pre>");self._parse_state = .{ .text = arr };},.image_jpeg, .image_gif, .image_png, .image_webp => {@@ -1824,19 +1826,19 @@ fn frameDataCallback(transfer: *HttpClient.Transfer, data: []const u8) !void {var v = data;while (v.len > 0) {const index = std.mem.findAnyPos(u8, v, 0, &.{ '<', '>', '&' }) orelse {- return buf.appendSlice(self.arena, v);+ return buf.appendSlice(self.page_arena, v);};- try buf.appendSlice(self.arena, v[0..index]);+ try buf.appendSlice(self.page_arena, v[0..index]);switch (v[index]) {- '<' => try buf.appendSlice(self.arena, "<"),- '>' => try buf.appendSlice(self.arena, ">"),- '&' => try buf.appendSlice(self.arena, "&"),+ '<' => try buf.appendSlice(self.page_arena, "<"),+ '>' => try buf.appendSlice(self.page_arena, ">"),+ '&' => try buf.appendSlice(self.page_arena, "&"),else => unreachable,}v = v[index + 1 ..];}},- .raw, .image => |*buf| try buf.appendSlice(self.arena, data),+ .raw, .image => |*buf| try buf.appendSlice(self.page_arena, data),.download => |*download| {download.file.writeStreamingAll(lp.io, data) catch |err| {// TODO(#2701 follow-up): surface the write failure properly. We@@ -1905,7 +1907,7 @@ fn frameDoneCallback(ctx: *anyopaque) !void {self._script_manager.staticScriptsDone();},.text => |*buf| {- try buf.appendSlice(self.arena, "</pre></body></html>");+ try buf.appendSlice(self.page_arena, "</pre></body></html>");parser.parse(buf.items);self._parse_state = .complete;self.documentIsComplete();@@ -2152,7 +2154,7 @@ pub fn iframeAddedCallback(self: *Frame, iframe: *IFrame) !void {iframe._executed = true;const session = self._session;- const new_frame = try self.arena.create(Frame);+ const new_frame = try self.page_arena.create(Frame);const frame_id = session.nextFrameId();try Frame.init(new_frame, frame_id, self.page, .{ .parent = self });@@ -2196,7 +2198,7 @@ pub fn iframeAddedCallback(self: *Frame, iframe: *IFrame) !void {// Append the new frame before navigate() so synchronous navigation paths// (about:blank, blob:) and the notifications they dispatch can see this// frame in self.child_frames.- try self.child_frames.append(self.arena, new_frame);+ try self.child_frames.append(self.page_arena, new_frame);// navigate() may run JS that reads window[N]; flag the list unsorted until// we've verified ordering post-navigate.@@ -2287,8 +2289,8 @@ pub fn openPopup(self: *Frame, opts: OpenPopupOpts) !*Frame {break :blk try URL.resolve(self.call_arena, frame_base, opts.url, .{ .encoding = self.charset });};- const popup = try page.frame_arena.create(Frame);- errdefer page.frame_arena.destroy(popup);+ const popup = try page.arena.create(Frame);+ errdefer page.arena.destroy(popup);const frame_id = session.nextFrameId();try Frame.init(popup, frame_id, page, .{});@@ -2302,11 +2304,11 @@ pub fn openPopup(self: *Frame, opts: OpenPopupOpts) !*Frame {!std.ascii.eqlIgnoreCase(opts.name, "_parent") and!std.ascii.eqlIgnoreCase(opts.name, "_top")){- popup.window._name = try page.frame_arena.dupe(u8, opts.name);+ popup.window._name = try page.arena.dupe(u8, opts.name);}const popup_index = page.popups.items.len;- try page.popups.append(page.frame_arena, popup);+ try page.popups.append(page.arena, popup);// not impossible that navigate adds popups, so remove by indexerrdefer _ = page.popups.swapRemove(popup_index);@@ -2393,7 +2395,7 @@ pub fn addElementId(self: *Frame, parent: *Node, element: *Element, id: []const}fn addElementIdWithMaps(self: *Frame, id_maps: ElementIdMaps, element: *Element, id: []const u8) !void {- const gop = try id_maps.lookup.getOrPut(self.arena, id);+ const gop = try id_maps.lookup.getOrPut(self.page_arena, id);if (!gop.found_existing) {gop.value_ptr.* = element;return;@@ -2413,7 +2415,7 @@ pub fn removeElementId(self: *Frame, element: *Element, id: []const u8) void {pub fn removeElementIdWithMaps(self: *Frame, id_maps: ElementIdMaps, id: []const u8) void {if (id_maps.lookup.remove(id)) {- const gop = id_maps.removed_ids.getOrPut(self.arena, id) catch |err| {+ const gop = id_maps.removed_ids.getOrPut(self.page_arena, id) catch |err| {log.warn(.frame, "removeElementIdWithMaps", .{ .err = err });return;};@@ -2452,7 +2454,7 @@ pub fn performance(self: *Frame) *Performance {// Tracks a file input's FileList so its File refs are released at teardown.pub fn trackFileList(self: *Frame, file_list: *FileList) !void {- try self._file_lists.append(self.arena, file_list);+ try self._file_lists.append(self.page_arena, file_list);}pub const QueuedEvent = struct {@@ -2476,7 +2478,7 @@ pub fn queueImageEvent(self: *Frame, image: *Element.Html.Image, kind: QueuedEve}fn queueEvent(self: *Frame, event: QueuedEvent) !void {- try self._queued_events.append(self.arena, event);+ try self._queued_events.append(self.page_arena, event);if (self._queued_events.items.len == 1) {try self.js.scheduler.add(self, struct {fn cleanup(ctx: *anyopaque) !?u32 {@@ -2674,7 +2676,7 @@ pub fn loadExternalStylesheet(self: *Frame, link: *Element.Html.Link, href: []colog.debug(.http, "external stylesheet parse", .{ .err = err, .url = resolved });return self.fireElementEvent(element, comptime .wrap("error"));};- sheet._href = try self.arena.dupe(u8, resolved);+ sheet._href = try self.page_arena.dupe(u8, resolved);try self.fireElementEvent(element, comptime .wrap("load"));}@@ -2812,7 +2814,7 @@ pub fn dupeString(self: *Frame, value: []const u8) ![]const u8 {if (String.intern(value)) |v| {return v;}- return self.arena.dupe(u8, value);+ return self.page_arena.dupe(u8, value);}// Direct (non-propagating) dispatch of an event. Mirrors WorkerGlobalScope.dispatch@@ -2833,7 +2835,7 @@ pub fn hasDirectListeners(self: *Frame, target: *EventTarget, typ: []const u8, h}pub fn dupeSSO(self: *Frame, value: []const u8) !String {- return String.init(self.arena, value, .{ .dupe = true });+ return String.init(self.page_arena, value, .{ .dupe = true });}const RemoveNodeOpts = struct {@@ -3341,7 +3343,7 @@ fn styleAttributeChanged(self: *Frame, element: *Element, value: ?[]const u8) vo}pub fn signalSlotChange(self: *Frame, slot: *Element.Html.Slot) void {- self._slots_pending_slotchange.put(self.arena, slot, {}) catch |err| {+ self._slots_pending_slotchange.put(self.page_arena, slot, {}) catch |err| {log.err(.frame, "signalSlotChange.put", .{ .err = err, .type = self._type, .url = self.url });return;};@@ -3358,7 +3360,7 @@ pub fn getCustomizedBuiltInDefinition(self: *Frame, element: *Element) ?*CustomE}pub fn setCustomizedBuiltInDefinition(self: *Frame, element: *Element, definition: *CustomElementDefinition) !void {- try self._customized_builtin_definitions.put(self.arena, element, definition);+ try self._customized_builtin_definitions.put(self.page_arena, element, definition);element._flags.customized_builtin = true;}diff --git a/src/browser/Page.zig b/src/browser/Page.zigindex 9e7f20d6c..53a7e731a 100644--- a/src/browser/Page.zig+++ b/src/browser/Page.zig@@ -89,8 +89,8 @@ factory: Factory,// The arena for this Page's lifetime. Document / Frame / Factory / DOM// objects allocate out of this.-_frame_arena: *lp.Arena,-frame_arena: Allocator,+_arena: *lp.Arena,+arena: Allocator,// Lazily-created per-node state, kept out of the nodes themselves because// few nodes ever need it. Keyed by node pointer and held by the Page, not a@@ -251,15 +251,15 @@ pub fn viewportChanged(self: *Page) void {// Initialize a Page and its root Frame.pub fn init(self: *Page, session: *Session, frame_id: u32) !void {- const frame_arena = try session.arena_pool.acquire(.large, "Page.frame_arena");- errdefer frame_arena.release();+ const arena = try session.arena_pool.acquire(.large, "Page.arena");+ errdefer arena.release();self.* = .{.session = session,.frame = undefined,- ._frame_arena = frame_arena,- .frame_arena = frame_arena.allocator(),- .factory = Factory.init(self, frame_arena.allocator(), &session.browser.documents),+ ._arena = arena,+ .arena = arena.allocator(),+ .factory = Factory.init(self, arena.allocator(), &session.browser.documents),.globals = .init(session.browser.app.allocator),.log_context = .{ .id = log.nextPageId(), .url = &self.frame.url },};@@ -360,7 +360,7 @@ pub fn deinit(self: *Page) void {}self.factory.deinit();- self._frame_arena.release();+ self._arena.release();}pub fn recordJsError(self: *Page, err: anyerror) void {@@ -406,8 +406,8 @@ pub fn createBlobUrl(self: *Page, blob: *Blob, origin: ?[]const u8, creator_framvar uuid: [36]u8 = undefined;@import("../id.zig").uuidv4(&uuid);- const url = try self.frame_arena.print("blob:{s}/{s}", .{ origin orelse "null", uuid });- try self.blob_urls.put(self.frame_arena, url, .{ .blob = blob, .creator = creator_frame_id });+ const url = try self.arena.print("blob:{s}/{s}", .{ origin orelse "null", uuid });+ try self.blob_urls.put(self.arena, url, .{ .blob = blob, .creator = creator_frame_id });blob.acquireRef();return url;}diff --git a/src/browser/ScriptManagerBase.zig b/src/browser/ScriptManagerBase.zigindex 20763ffc2..61266818e 100644--- a/src/browser/ScriptManagerBase.zig+++ b/src/browser/ScriptManagerBase.zig@@ -922,7 +922,7 @@ pub const Script = struct {// Handle importmap special case here: the content is a JSON containing imports.// Multiple <script type="importmap"> elements merge with first-wins semantics.if (fe.kind == .importmap) {- self.manager.importmap.merge(frame.arena, frame.base(), self.source.content()) catch |err| {+ self.manager.importmap.merge(frame.page_arena, frame.base(), self.source.content()) catch |err| {log.debug(.browser, "parse importmap script", .{.err = err,.src = url,diff --git a/src/browser/frame/node_factory.zig b/src/browser/frame/node_factory.zigindex 3dbac16ae..556726d84 100644--- a/src/browser/frame/node_factory.zig+++ b/src/browser/frame/node_factory.zig@@ -809,7 +809,7 @@ pub fn createElementNS(document: *const Node.Document, namespace: Element.Namesp},else => {},}- const tag_name = try String.init(frame.arena, name, .{});+ const tag_name = try String.init(frame.page_arena, name, .{});// Check if this is a custom element (must have hyphen for HTML namespace)const has_hyphen = std.mem.findScalar(u8, name, '-') != null;@@ -838,7 +838,7 @@ pub fn createElementNS(document: *const Node.Document, namespace: Element.Namesp._upgrade_candidate = creation != .bare_context,});if (creation != .bare_context) {- try realm._undefined_custom_elements.append(realm.arena, node.as(Element).is(Element.Html.Custom).?);+ try realm._undefined_custom_elements.append(realm.page_arena, node.as(Element).is(Element.Html.Custom).?);}return node;}@@ -951,7 +951,7 @@ pub fn createElementNS(document: *const Node.Document, namespace: Element.Namespreturn createSvgElementT(document, Element.Svg.Generic, name, attribute_iterator, .{ ._tag = tag });},else => {- const tag_name = try String.init(frame.arena, name, .{});+ const tag_name = try String.init(frame.page_arena, name, .{});return createHtmlElementT(document, Element.Html.Unknown, namespace, attribute_iterator, .{ ._tag_name = tag_name });},}@@ -1166,7 +1166,7 @@ pub fn constructCustomElement(frame: *Frame, new_target: JS.Function) !*Elementreturn error.IllegalConstructor;}- const tag_name = try String.init(frame.arena, definition.name, .{});+ const tag_name = try String.init(frame.page_arena, definition.name, .{});const node = try createHtmlElementT(frame.document, Element.Html.Custom, .html, null, .{._tag_name = tag_name,._definition = definition,diff --git a/src/browser/frame/observers.zig b/src/browser/frame/observers.zigindex d80916bb8..743ecb800 100644--- a/src/browser/frame/observers.zig+++ b/src/browser/frame/observers.zig@@ -106,7 +106,7 @@ pub fn unregisterMutationObserver(frame: *Frame, observer: *MutationObserver) vopub fn registerIntersectionObserver(frame: *Frame, observer: *IntersectionObserver) !void {observer.acquireRef();- try frame._intersection.observers.append(frame.arena, observer);+ try frame._intersection.observers.append(frame.page_arena, observer);}pub fn unregisterIntersectionObserver(frame: *Frame, observer: *IntersectionObserver) void {@@ -121,7 +121,7 @@ pub fn unregisterIntersectionObserver(frame: *Frame, observer: *IntersectionObsepub fn registerResizeObserver(frame: *Frame, observer: *ResizeObserver) !void {observer.acquireRef();- try frame._resize.observers.append(frame.arena, observer);+ try frame._resize.observers.append(frame.page_arena, observer);}pub fn unregisterResizeObserver(frame: *Frame, observer: *ResizeObserver) void {diff --git a/src/browser/frame/preload.zig b/src/browser/frame/preload.zigindex ca7ad8811..43d17f210 100644--- a/src/browser/frame/preload.zig+++ b/src/browser/frame/preload.zig@@ -60,7 +60,7 @@ pub fn moduleHint(frame: *Frame, element: ?*Element.Html, href: []const u8) bool// The url becomes the imported_modules key, which must outlive the fetch// so it lives on the frame arena- const resolved = URL.resolve(frame.arena, frame.base(), href, .{ .encoding = frame.charset }) catch return false;+ const resolved = URL.resolve(frame.page_arena, frame.base(), href, .{ .encoding = frame.charset }) catch return false;if (!isRemoteScheme(resolved)) {return false;}@@ -117,7 +117,7 @@ const Prescan = struct {}// The url becomes the imported_modules key, which must// outlive the fetch so it lives on the frame arena.- const resolved = URL.resolve(frame.arena, self.base, href, .{ .encoding = frame.charset }) catch return;+ const resolved = URL.resolve(frame.page_arena, self.base, href, .{ .encoding = frame.charset }) catch return;if (isRemoteScheme(resolved) == false) {return;}diff --git a/src/browser/js/Context.zig b/src/browser/js/Context.zigindex 2b496293c..d77c79631 100644--- a/src/browser/js/Context.zig+++ b/src/browser/js/Context.zig@@ -98,7 +98,7 @@ origin: *Origin,identity: *js.Identity,// Allocator to use for identity map operations. For main world contexts this is-// page.frame_arena, for isolated worlds it's the isolated world's arena.+// page.arena, for isolated worlds it's the isolated world's arena.identity_arena: Allocator,// Unlike other v8 types, like functions or objects, modules are not shareddiff --git a/src/browser/js/Env.zig b/src/browser/js/Env.zigindex fd959d13e..0264ffc74 100644--- a/src/browser/js/Env.zig+++ b/src/browser/js/Env.zig@@ -405,7 +405,7 @@ fn _createContext(self: *Env, global: anytype, params: ContextParams) !*Context.url = &global.url,.buf = &global.buf,.charset = &global.charset,- .arena = global.arena,+ .page_arena = if (comptime is_frame) global.page_arena else global.arena,.page = context.page,.session = page.session,.call_arena = params.call_arena,diff --git a/src/browser/js/Execution.zig b/src/browser/js/Execution.zigindex 760338bfb..f60792df1 100644--- a/src/browser/js/Execution.zig+++ b/src/browser/js/Execution.zig@@ -53,7 +53,9 @@ js: *Context,// Fields named to match Page for generic code (executor._factory works for both)buf: []u8,-arena: Allocator,+// For a Frame, the Page's arena. For a worker, the worker's own arena (a worker+// has its own identity map, so nothing it allocates is shared with another realm).+page_arena: Allocator,call_arena: Allocator,local_arena: Allocator,@@ -72,7 +74,7 @@ pub fn dupeString(self: *const Execution, value: []const u8) ![]const u8 {if (String.intern(value)) |v| {return v;}- return self.arena.dupe(u8, value);+ return self.page_arena.dupe(u8, value);}pub fn getArena(self: *const Execution, size_or_bucket: anytype, debug: []const u8) !*lp.Arena {diff --git a/src/browser/js/Local.zig b/src/browser/js/Local.zigindex c0b62934c..05e6ed6d6 100644--- a/src/browser/js/Local.zig+++ b/src/browser/js/Local.zig@@ -330,7 +330,7 @@ pub fn mapZigInstanceToJs(self: *const Local, js_obj_handle: ?*const v8.Object,const page = ctx.page;const session = page.session;- const finalizer_gop = try page.finalizer_callbacks.getOrPut(page.frame_arena, finalizer_ptr_id);+ const finalizer_gop = try page.finalizer_callbacks.getOrPut(page.arena, finalizer_ptr_id);if (finalizer_gop.found_existing == false) {// This is the first context (and very likely only one) to// see this Zig instance. We need to create the FinalizerCallbackdiff --git a/src/browser/js/String.zig b/src/browser/js/String.zigindex 081fd29d8..9fb34ebf0 100644--- a/src/browser/js/String.zig+++ b/src/browser/js/String.zig@@ -71,7 +71,7 @@ fn _toSlice(self: String, comptime null_terminate: bool, allocator: Allocator) !pub fn toSSO(self: String, comptime global: bool) !(if (global) lp.String.Global else lp.String) {if (comptime global) {- return .{ .str = try self.toSSOWithAlloc(self.local.ctx.page.frame_arena) };+ return .{ .str = try self.toSSOWithAlloc(self.local.ctx.page.arena) };}return self.toSSOWithAlloc(self.local.call_arena);}diff --git a/src/browser/parser/Parser.zig b/src/browser/parser/Parser.zigindex 1e1643fa8..a5ae06911 100644--- a/src/browser/parser/Parser.zig+++ b/src/browser/parser/Parser.zig@@ -91,7 +91,7 @@ pending_text: ?PendingText,// on flush keeps the largest capacity ever needed, so total dead memory on the// parser arena is bounded to one peak-run-sized allocation regardless of how// many text runs the parse contains. Matters for Streaming, whose arena is the-// page-lifetime frame.arena (individual frees are no-ops there).+// page-lifetime frame.page_arena (individual frees are no-ops there).//// Single-chunk text runs leave this buf empty: the chunk lives only in// CData._data via createTextNode. The buf is seeded from _data.str() on the@@ -150,7 +150,7 @@ pub fn flushPendingText(self: *Parser) !void {if (self.buf.items.len == 0) return;defer self.buf.clearRetainingCapacity();pt.text_node._data = try lp.String.init(- self.frame.arena,+ self.frame.page_arena,self.buf.items,.{ .dupe = true },);@@ -570,7 +570,7 @@ fn _createElementCallback(self: *Parser, data: *anyopaque, qname: h5e.QualName,// Same as Document.createElementNS: keep the URI so namespaceURI and// lookupNamespaceURI can return it.const page = self.document._page;- try page.element_namespace_uris.put(page.frame_arena, node.as(Element), try frame.dupeString(namespace_string));+ try page.element_namespace_uris.put(page.arena, node.as(Element), try frame.dupeString(namespace_string));}const pn = try self.arena.create(ParsedNode);@@ -832,7 +832,7 @@ fn rebuildIn(self: *Parser, node: *Node, document: *Node.Document) !*Node {// The URI lives in a side table, see _createElementCallback.const page = self.document._page;if (page.element_namespace_uris.fetchRemove(element)) |entry| {- try page.element_namespace_uris.put(page.frame_arena, copy.as(Element), entry.value);+ try page.element_namespace_uris.put(page.arena, copy.as(Element), entry.value);}}return copy;diff --git a/src/browser/structured_data.zig b/src/browser/structured_data.zigindex 44909466f..8972ba285 100644--- a/src/browser/structured_data.zig+++ b/src/browser/structured_data.zig@@ -705,10 +705,10 @@ test "structured_data: link headers from response" {defer testing.test_session.closeAllPages();// Stand in for what frameHeaderDoneCallback records from the navigation.- try frame._http_headers.append(frame.arena, .{ .name = "link", .value =+ try frame._http_headers.append(frame.page_arena, .{ .name = "link", .value =\\<https://docs.example.com/>; rel="service-doc"});- try frame._http_headers.append(frame.arena, .{ .name = "link", .value =+ try frame._http_headers.append(frame.page_arena, .{ .name = "link", .value =\\<https://api.example.com/spec>; rel="service-desc", </css/site.css>; rel="stylesheet"});diff --git a/src/browser/webapi/AbortSignal.zig b/src/browser/webapi/AbortSignal.zigindex 9adf1effc..18b3d069d 100644--- a/src/browser/webapi/AbortSignal.zig+++ b/src/browser/webapi/AbortSignal.zig@@ -143,7 +143,7 @@ fn markAborted(self: *AbortSignal, reason_: ?Reason, exec: *const Execution) !vo} else {// Allocate the DOMException so the reason keeps a single JS identity:// dependent signals must expose the very same DOMException instance.- const dom = try exec.arena.create(DOMException);+ const dom = try exec.page_arena.create(DOMException);dom.* = DOMException.fromError(error.AbortError).?;self._reason = .{ .dom = dom };}@@ -203,12 +203,12 @@ fn createAny(signals_value: js.Value, exec: *const Execution) !*AbortSignal {for (signals) |source| {if (!source._is_dependent) {- try source._dependents.append(exec.arena, .{ .signal = result });- try result._source_signals.append(exec.arena, source);+ try source._dependents.append(exec.page_arena, .{ .signal = result });+ try result._source_signals.append(exec.page_arena, source);} else {for (source._source_signals.items) |s| {- try s._dependents.append(exec.arena, .{ .signal = result });- try result._source_signals.append(exec.arena, s);+ try s._dependents.append(exec.page_arena, .{ .signal = result });+ try result._source_signals.append(exec.page_arena, s);}}}@@ -225,7 +225,7 @@ fn createTimeout(milliseconds: f64, exec: *const Execution) !*AbortSignal {}const delay: u32 = @intFromFloat(@min(truncated, std.math.maxInt(u32)));- const callback = try exec.arena.create(TimeoutCallback);+ const callback = try exec.page_arena.create(TimeoutCallback);callback.* = .{.exec = exec,.signal = try init(exec),@@ -303,7 +303,7 @@ const TimeoutCallback = struct {.worker => {},}- const dom = try self.exec.arena.create(DOMException);+ const dom = try self.exec.page_arena.create(DOMException);dom.* = DOMException.fromError(error.TimeoutError).?;try self.signal.abort(.{ .dom = dom }, self.exec);}diff --git a/src/browser/webapi/CData.zig b/src/browser/webapi/CData.zigindex 35fc06ac6..f140086f1 100644--- a/src/browser/webapi/CData.zig+++ b/src/browser/webapi/CData.zig@@ -384,7 +384,7 @@ fn deleteData(self: *CData, offset: usize, count: usize, frame: *Frame) !void {self._data = try frame.dupeSSO(old_value[0..range.start]);} else {// Deleting from middle - concat prefix and suffix- self._data = try String.concat(frame.arena, &.{+ self._data = try String.concat(frame.page_arena, &.{old_value[0..range.start],old_value[range.end..],});@@ -400,7 +400,7 @@ fn insertData(self: *CData, offset: usize, data: []const u8, frame: *Frame) !voiconst old_value = self._data;const existing = old_value.str();- self._data = try String.concat(frame.arena, &.{+ self._data = try String.concat(frame.page_arena, &.{existing[0..byte_offset],data,existing[byte_offset..],@@ -419,7 +419,7 @@ pub fn replaceData(self: *CData, offset: usize, count: usize, data: []const u8,const old_value = self._data;const existing = old_value.str();- self._data = try String.concat(frame.arena, &.{+ self._data = try String.concat(frame.page_arena, &.{existing[0..range.start],data,existing[range.end..],diff --git a/src/browser/webapi/Console.zig b/src/browser/webapi/Console.zigindex 60ff76503..c0bce7847 100644--- a/src/browser/webapi/Console.zig+++ b/src/browser/webapi/Console.zig@@ -117,13 +117,13 @@ pub fn dirxml(values: []js.Value, exec: *js.Execution) void {pub fn count(label_: ?[]const u8, exec: *js.Execution) !void {const self = exec.console();const label = label_ orelse "default";- const gop = try self._counts.getOrPut(exec.arena, label);+ const gop = try self._counts.getOrPut(exec.page_arena, label);var current: u64 = 0;if (gop.found_existing) {current = gop.value_ptr.*;} else {- gop.key_ptr.* = try exec.arena.dupe(u8, label);+ gop.key_ptr.* = try exec.page_arena.dupe(u8, label);}const c = current + 1;@@ -145,13 +145,13 @@ pub fn countReset(label_: ?[]const u8, exec: *js.Execution) !void {pub fn time(label_: ?[]const u8, exec: *js.Execution) !void {const self = exec.console();const label = label_ orelse "default";- const gop = try self._timers.getOrPut(exec.arena, label);+ const gop = try self._timers.getOrPut(exec.page_arena, label);if (gop.found_existing) {logger.info(.js, "console.time", .{ .label = label, .err = "duplicate timer" });return;}- gop.key_ptr.* = try exec.arena.dupe(u8, label);+ gop.key_ptr.* = try exec.page_arena.dupe(u8, label);gop.value_ptr.* = lp.datetime.timestamp(.boot);}diff --git a/src/browser/webapi/CustomElementRegistry.zig b/src/browser/webapi/CustomElementRegistry.zigindex 14850d2cc..87f9c69c0 100644--- a/src/browser/webapi/CustomElementRegistry.zig+++ b/src/browser/webapi/CustomElementRegistry.zig@@ -78,8 +78,8 @@ pub fn define(self: *CustomElementRegistry, name: []const u8, constructor: js.Fuvar js_arr = observed_attrs.toArray();for (0..js_arr.len()) |i| {const attr_val = js_arr.get(@intCast(i)) catch continue;- const attr_name = attr_val.toStringSliceWithAlloc(frame.arena) catch continue;- definition.observed_attributes.put(frame.arena, attr_name, {}) catch continue;+ const attr_name = attr_val.toStringSliceWithAlloc(frame.page_arena) catch continue;+ definition.observed_attributes.put(frame.page_arena, attr_name, {}) catch continue;}}}@@ -98,7 +98,7 @@ pub fn define(self: *CustomElementRegistry, name: []const u8, constructor: js.Fu}}- const gop = try self._definitions.getOrPut(frame.arena, owned_name);+ const gop = try self._definitions.getOrPut(frame.page_arena, owned_name);if (gop.found_existing) {return error.NotSupported;}@@ -163,7 +163,7 @@ pub fn whenDefined(self: *CustomElementRegistry, name: []const u8, frame: *Frametry validateName(name);- const gop = try self._when_defined.getOrPut(frame.arena, name);+ const gop = try self._when_defined.getOrPut(frame.page_arena, name);if (gop.found_existing) {return local.toLocal(gop.value_ptr.*).promise();}diff --git a/src/browser/webapi/DOMImplementation.zig b/src/browser/webapi/DOMImplementation.zigindex 9e9c5c311..3a93fb130 100644--- a/src/browser/webapi/DOMImplementation.zig+++ b/src/browser/webapi/DOMImplementation.zig@@ -122,7 +122,7 @@ fn createDocument(_: *const DOMImplementation, namespace_nullable: js.Nullable([if (namespace == .unknown) {if (namespace_) |uri| {const duped = try frame.dupeString(uri);- try document._page.element_namespace_uris.put(document._page.frame_arena, root.as(Node.Element), duped);+ try document._page.element_namespace_uris.put(document._page.arena, root.as(Node.Element), duped);}}diff --git a/src/browser/webapi/DOMParser.zig b/src/browser/webapi/DOMParser.zigindex 337118aa5..d5ae66678 100644--- a/src/browser/webapi/DOMParser.zig+++ b/src/browser/webapi/DOMParser.zig@@ -73,7 +73,7 @@ fn parserErrorDocument(frame: *Frame) !*Document.XMLDocument {const doc = try frame._factory.document(Document.XMLDocument{ ._proto = undefined });const root = try Frame.node_factory.createElementNS(doc.asDocument(), .unknown, "parsererror", null);const page = doc.asDocument()._page;- try page.element_namespace_uris.put(page.frame_arena, root.as(Node.Element), parsererror_ns);+ try page.element_namespace_uris.put(page.arena, root.as(Node.Element), parsererror_ns);const text = try Frame.node_factory.createTextNode(doc.asDocument(), "error");_ = try root.appendChild(text, frame);_ = try doc.asNode().appendChild(root, frame);diff --git a/src/browser/webapi/DataTransfer.zig b/src/browser/webapi/DataTransfer.zigindex 9be567b3f..15ac34256 100644--- a/src/browser/webapi/DataTransfer.zig+++ b/src/browser/webapi/DataTransfer.zig@@ -201,10 +201,10 @@ fn rebuildFiles(self: *DataTransfer, frame: *Frame) !void {var files: std.ArrayList(*File) = .empty;for (self._items.items) |it| {if (it._kind == .file) {- try files.append(frame.arena, it._payload.file);+ try files.append(frame.page_arena, it._payload.file);}}- self._files._files = try files.toOwnedSlice(frame.arena);+ self._files._files = try files.toOwnedSlice(frame.page_arena);}// --- accessors ---diff --git a/src/browser/webapi/Document.zig b/src/browser/webapi/Document.zigindex 8d96047c6..dc4c6e13c 100644--- a/src/browser/webapi/Document.zig+++ b/src/browser/webapi/Document.zig@@ -122,7 +122,7 @@ fn getOnClick(self: *Document, frame: *Frame) ?js.Function.Global {fn setOnClick(self: *Document, setter: ?Window.FunctionSetter, frame: *Frame) !void {const owner = self._frame orelse frame;if (Window.getFunctionFromSetter(setter)) |cb| {- try owner._event_target_attr_listeners.put(owner.arena, .{ .target = self.asEventTarget(), .handler = .onclick }, cb);+ try owner._event_target_attr_listeners.put(owner.page_arena, .{ .target = self.asEventTarget(), .handler = .onclick }, cb);} else {_ = owner._event_target_attr_listeners.remove(.{ .target = self.asEventTarget(), .handler = .onclick });}@@ -410,7 +410,7 @@ pub fn createElementNS(self: *Document, namespace: ?[]const u8, name: []const u8if (ns == .unknown) {if (namespace) |uri| {const duped = try frame.dupeString(uri);- try self._page.element_namespace_uris.put(self._page.frame_arena, node.as(Element), duped);+ try self._page.element_namespace_uris.put(self._page.arena, node.as(Element), duped);}}return node.as(Element);@@ -461,7 +461,7 @@ pub fn getElementById(self: *Document, id: []const u8, frame: *Frame) ?*Element// if it really failed, then we're out of memory and nothing's// going to work like it should anyways.const owned_id = frame.dupeString(id) catch return null;- self._elements_by_id.put(frame.arena, owned_id, el) catch return null;+ self._elements_by_id.put(frame.page_arena, owned_id, el) catch return null;return el;}}@@ -483,7 +483,7 @@ pub fn getElementsByClassName(self: *Document, class_name: []const u8, frame: *F}fn getElementsByName(self: *Document, name: []const u8, frame: *Frame) !collections.NodeLive(.name) {- const arena = frame.arena;+ const arena = frame.page_arena;const filter = try arena.dupe(u8, name);return collections.NodeLive(.name).init(self.asNode(), filter, frame);}@@ -1257,7 +1257,7 @@ pub fn open(self: *Document, call_frame: *Frame) !*Document {}// reset the document- self._elements_by_id.clearAndFree(frame.arena);+ self._elements_by_id.clearAndFree(frame.page_arena);self.setActiveElement(null, frame);self._open_popovers = .empty;self._style_sheets = null;@@ -1270,9 +1270,9 @@ pub fn open(self: *Document, call_frame: *Frame) !*Document {if (std.mem.findScalar(*Document, frame._script_created_parser_docs.items, self) == null) {// have the page track this document (if it isn't already)// so that, on shutdown, it can close the parser if needed.- try frame._script_created_parser_docs.append(frame.arena, self);+ try frame._script_created_parser_docs.append(frame.page_arena, self);}- self._script_created_parser = Parser.Streaming.init(frame.arena, doc_node, frame, .{ .allow_declarative_shadow = true });+ self._script_created_parser = Parser.Streaming.init(frame.page_arena, doc_node, frame, .{ .allow_declarative_shadow = true });// on start() failure the internal `handle` isn't yet create. So we can't// call done() and we don't want any subsequent cleanup to call done().errdefer self._script_created_parser = null;@@ -1758,7 +1758,7 @@ pub const JsApi = struct {pub fn set(self: *Document, setter: ?Window.FunctionSetter, frame: *Frame) !void {const owner = self._frame orelse frame;if (Window.getFunctionFromSetter(setter)) |cb| {- try owner._event_target_attr_listeners.put(owner.arena, .{ .target = self.asEventTarget(), .handler = handler }, cb);+ try owner._event_target_attr_listeners.put(owner.page_arena, .{ .target = self.asEventTarget(), .handler = handler }, cb);} else {_ = owner._event_target_attr_listeners.remove(.{ .target = self.asEventTarget(), .handler = handler });}diff --git a/src/browser/webapi/Element.zig b/src/browser/webapi/Element.zigindex 43fbf49f2..e2e1007b7 100644--- a/src/browser/webapi/Element.zig+++ b/src/browser/webapi/Element.zig@@ -926,7 +926,7 @@ pub fn attachShadow(self: *Element, opts: ShadowRoot.AttachOptions, frame: *Framconst shadow_root = try ShadowRoot.init(self, opts, frame);const page = frame.page;- try page.element_shadow_roots.put(page.frame_arena, self, shadow_root);+ try page.element_shadow_roots.put(page.arena, self, shadow_root);self._flags.shadow_host = true;return shadow_root;}@@ -1026,7 +1026,7 @@ pub fn getAttributeNames(self: *const Element, frame: *Frame) ![][]const u8 {pub fn getAttributeNamedNodeMap(self: *Element, frame: *Frame) !*Attribute.NamedNodeMap {const page = frame.page;- const gop = try page.attribute_named_node_map_lookup.getOrPut(page.frame_arena, @intFromPtr(self));+ const gop = try page.attribute_named_node_map_lookup.getOrPut(page.arena, @intFromPtr(self));if (!gop.found_existing) {gop.value_ptr.* = try frame._factory.create(Attribute.NamedNodeMap{ ._element = self });}@@ -1038,7 +1038,7 @@ pub fn getAttributeNamedNodeMap(self: *Element, frame: *Frame) !*Attribute.Namedpub fn getOrCreateStyle(self: *Element, frame: *Frame) !*CSSStyleProperties {const owner = self.ownerFrame(frame) orelse frame;const page = frame.page;- const gop = try page.element_styles.getOrPut(page.frame_arena, self);+ const gop = try page.element_styles.getOrPut(page.arena, self);if (!gop.found_existing) {gop.value_ptr.* = try CSSStyleProperties.init(self, false, owner);}@@ -1087,7 +1087,7 @@ pub fn setStyle(self: *Element, value: []const u8, frame: *Frame) !void {pub fn getClassList(self: *Element, frame: *Frame) !*collections.DOMTokenList {const page = frame.page;- const gop = try page.element_class_lists.getOrPut(page.frame_arena, self);+ const gop = try page.element_class_lists.getOrPut(page.arena, self);if (!gop.found_existing) {gop.value_ptr.* = try frame._factory.create(collections.DOMTokenList{._element = self,@@ -1109,7 +1109,7 @@ pub fn setPartList(self: *Element, value: String, frame: *Frame) !void {pub fn getPartList(self: *Element, frame: *Frame) !*collections.DOMTokenList {const page = frame.page;- const gop = try page.element_part_lists.getOrPut(page.frame_arena, self);+ const gop = try page.element_part_lists.getOrPut(page.arena, self);if (!gop.found_existing) {gop.value_ptr.* = try frame._factory.create(collections.DOMTokenList{._element = self,@@ -1121,7 +1121,7 @@ pub fn getPartList(self: *Element, frame: *Frame) !*collections.DOMTokenList {pub fn getRelList(self: *Element, frame: *Frame) !*collections.DOMTokenList {const page = frame.page;- const gop = try page.element_rel_lists.getOrPut(page.frame_arena, self);+ const gop = try page.element_rel_lists.getOrPut(page.arena, self);if (!gop.found_existing) {gop.value_ptr.* = try frame._factory.create(collections.DOMTokenList{._element = self,@@ -1139,7 +1139,7 @@ pub const TokenListLookup = std.AutoHashMapUnmanaged(TokenListKey, *collections.pub fn getTokenList(self: *Element, comptime attribute: TokenListAttribute, frame: *Frame) !*collections.DOMTokenList {const page = frame.page;- const gop = try page.element_token_lists.getOrPut(page.frame_arena, .{ .element = self, .attribute = attribute });+ const gop = try page.element_token_lists.getOrPut(page.arena, .{ .element = self, .attribute = attribute });if (!gop.found_existing) {gop.value_ptr.* = try frame._factory.create(collections.DOMTokenList{._element = self,@@ -1151,7 +1151,7 @@ pub fn getTokenList(self: *Element, comptime attribute: TokenListAttribute, frampub fn getDataset(self: *Element, frame: *Frame) !*DOMStringMap {const page = frame.page;- const gop = try page.element_datasets.getOrPut(page.frame_arena, self);+ const gop = try page.element_datasets.getOrPut(page.arena, self);if (!gop.found_existing) {gop.value_ptr.* = try frame._factory.create(DOMStringMap{._element = self,@@ -2069,7 +2069,7 @@ pub fn clone(self: *Element, deep: bool, document: *const Node.Document, frame:if (self._namespace == .unknown) {const page = document._page;if (page.element_namespace_uris.get(self)) |uri| {- try page.element_namespace_uris.put(page.frame_arena, node.as(Element), uri);+ try page.element_namespace_uris.put(page.arena, node.as(Element), uri);}}@@ -2207,7 +2207,7 @@ fn writeScroll(self: *Element, write: ScrollWrite, frame: *Frame) !bool {return false;}- const gop = try owner.page.element_scroll_positions.getOrPut(owner.page.frame_arena, self);+ const gop = try owner.page.element_scroll_positions.getOrPut(owner.page.arena, self);if (!gop.found_existing) {gop.value_ptr.* = .{};}diff --git a/src/browser/webapi/MessagePort.zig b/src/browser/webapi/MessagePort.zigindex 86aea188f..6ae7b7e56 100644--- a/src/browser/webapi/MessagePort.zig+++ b/src/browser/webapi/MessagePort.zig@@ -101,7 +101,7 @@ pub fn postMessage(self: *MessagePort, message: js.Value) !void {errdefer cloned.release();if (!other._enabled) {- try other._pending.append(other._exec.arena, cloned);+ try other._pending.append(other._exec.page_arena, cloned);return;}diff --git a/src/browser/webapi/ModelContext.zig b/src/browser/webapi/ModelContext.zigindex f81168a19..f0f311fce 100644--- a/src/browser/webapi/ModelContext.zig+++ b/src/browser/webapi/ModelContext.zig@@ -99,7 +99,7 @@ pub fn registerTool(}}- const arena = exec.arena;+ const arena = exec.page_arena;const entry = try arena.create(Tool);entry.* = .{.ctx = self,diff --git a/src/browser/webapi/Node.zig b/src/browser/webapi/Node.zigindex dc5e71d68..1c6a54689 100644--- a/src/browser/webapi/Node.zig+++ b/src/browser/webapi/Node.zig@@ -1458,7 +1458,7 @@ pub fn getElementsByTagName(self: *Node, tag_name: []const u8, frame: *Frame) !G};}- const arena = frame.arena;+ const arena = frame.page_arena;const filter = try String.init(arena, tag_name, .{});return .{ .tag_name = collections.NodeLive(.tag_name).init(self, filter, frame) };}@@ -1477,13 +1477,13 @@ pub fn getElementsByTagNameNS(self: *Node, namespace: ?[]const u8, local_name: [return collections.NodeLive(.tag_name_ns).init(self, .{.namespace = ns,- .local_name = try String.init(frame.arena, local_name, .{}),+ .local_name = try String.init(frame.page_arena, local_name, .{}),}, frame);}// Not exposed in the WebAPI, but used by both Element and Documentpub fn getElementsByClassName(self: *Node, class_name: []const u8, frame: *Frame) !collections.NodeLive(.class_name) {- const arena = frame.arena;+ const arena = frame.page_arena;// Parse space-separated class namesvar class_names: std.ArrayList([]const u8) = .empty;diff --git a/src/browser/webapi/PerformanceObserver.zig b/src/browser/webapi/PerformanceObserver.zigindex 5aacb45b3..ec4d065fe 100644--- a/src/browser/webapi/PerformanceObserver.zig+++ b/src/browser/webapi/PerformanceObserver.zig@@ -65,7 +65,7 @@ pub fn init(callback: js.Function.Global, exec: *const Execution) !*PerformanceO._entries = .empty,._performance = exec.performance(),._js = exec.js,- ._arena = exec.arena,+ ._arena = exec.page_arena,});}diff --git a/src/browser/webapi/Scheduler.zig b/src/browser/webapi/Scheduler.zigindex 90a0e514a..3806450a0 100644--- a/src/browser/webapi/Scheduler.zig+++ b/src/browser/webapi/Scheduler.zig@@ -92,7 +92,7 @@ pub fn postTask(self: *Scheduler, cb: js.Function.Global, options_: ?js.Value, etask.resolver = try resolver.persist();task.state = .{ .priority = priority, .signal = opts.signal };if (opts.signal) |signal| {- try signal._dependents.append(exec.arena, .{ .scheduler_task = task });+ try signal._dependents.append(exec.page_arena, .{ .scheduler_task = task });}try exec.js.scheduler.add(task, Task.run, opts.delay orelse 0, .{.name = "scheduler.postTask",@@ -119,7 +119,7 @@ pub fn yield(self: *Scheduler, exec: *js.Execution) !js.Promise {task.resolver = try resolver.persist();task.state = state;if (state.signal) |signal| {- try signal._dependents.append(exec.arena, .{ .scheduler_task = task });+ try signal._dependents.append(exec.page_arena, .{ .scheduler_task = task });}try exec.js.scheduler.add(task, Task.run, 0, .{.name = "scheduler.yield",@@ -151,7 +151,7 @@ pub const Task = struct {fn create(signal: ?*AbortSignal, exec: *js.Execution) !*Task {if (signal != null) {- const task = try exec.arena.create(Task);+ const task = try exec.page_arena.create(Task);task.exec = exec;task.arena = null;return task;diff --git a/src/browser/webapi/ServiceWorker.zig b/src/browser/webapi/ServiceWorker.zigindex 601cac38e..697aaac21 100644--- a/src/browser/webapi/ServiceWorker.zig+++ b/src/browser/webapi/ServiceWorker.zig@@ -64,7 +64,7 @@ pub const State = enum {};pub fn init(scope: *ServiceWorkerGlobalScope, exec: *Execution) !*ServiceWorker {- return exec._factory.eventTargetWithAllocator(exec.arena, ServiceWorker{+ return exec._factory.eventTargetWithAllocator(exec.page_arena, ServiceWorker{._proto = undefined,._exec = exec,._scope = scope,diff --git a/src/browser/webapi/ServiceWorkerContainer.zig b/src/browser/webapi/ServiceWorkerContainer.zigindex 09155b9fb..fcb88c33a 100644--- a/src/browser/webapi/ServiceWorkerContainer.zig+++ b/src/browser/webapi/ServiceWorkerContainer.zig@@ -52,7 +52,7 @@ const RegisterOptions = struct {};pub fn init(frame: *Frame) !*ServiceWorkerContainer {- const self = try frame._factory.eventTargetWithAllocator(frame.arena, ServiceWorkerContainer{+ const self = try frame._factory.eventTargetWithAllocator(frame.page_arena, ServiceWorkerContainer{._proto = undefined,._frame = frame,});@@ -159,7 +159,7 @@ fn track(self: *ServiceWorkerContainer, scope: *ServiceWorkerGlobalScope) !*Servconst frame = self._frame;const registration = try ServiceWorkerRegistration.init(scope, self, &frame.js.execution);errdefer registration.detach();- try self._registrations.append(frame.arena, registration);+ try self._registrations.append(frame.page_arena, registration);if (scope.hasActiveWorker()) {self.workerActivated();diff --git a/src/browser/webapi/ServiceWorkerGlobalScope.zig b/src/browser/webapi/ServiceWorkerGlobalScope.zigindex 64f03a49e..419b9c89d 100644--- a/src/browser/webapi/ServiceWorkerGlobalScope.zig+++ b/src/browser/webapi/ServiceWorkerGlobalScope.zig@@ -186,7 +186,7 @@ pub fn getOrCreate(errdefer self.deinit();const page = frame.page;- try page.service_workers.append(page.frame_arena, self);+ try page.service_workers.append(page.arena, self);errdefer _ = page.service_workers.pop();try session.service_workers.put(session.arena.allocator(), self._scope_url, self);diff --git a/src/browser/webapi/ServiceWorkerRegistration.zig b/src/browser/webapi/ServiceWorkerRegistration.zigindex 56b5fae6c..2eec58acf 100644--- a/src/browser/webapi/ServiceWorkerRegistration.zig+++ b/src/browser/webapi/ServiceWorkerRegistration.zig@@ -53,11 +53,11 @@ _node: std.DoublyLinkedList.Node = .{},_on_update_found: ?js.Function.Global = null,pub fn init(scope: *ServiceWorkerGlobalScope, container: ?*ServiceWorkerContainer, exec: *Execution) !*ServiceWorkerRegistration {- const self = try exec._factory.eventTargetWithAllocator(exec.arena, ServiceWorkerRegistration{+ const self = try exec._factory.eventTargetWithAllocator(exec.page_arena, ServiceWorkerRegistration{._proto = undefined,._exec = exec,._scope = scope,- ._scope_url = try exec.arena.dupe(u8, scope._scope_url),+ ._scope_url = try exec.page_arena.dupe(u8, scope._scope_url),._container = container,});scope._registrations.append(&self._node);diff --git a/src/browser/webapi/ShadowRoot.zig b/src/browser/webapi/ShadowRoot.zigindex ac18e3935..194755796 100644--- a/src/browser/webapi/ShadowRoot.zig+++ b/src/browser/webapi/ShadowRoot.zig@@ -129,7 +129,7 @@ fn getOnSlotChange(self: *ShadowRoot, frame: *Frame) ?js.Function.Global {fn setOnSlotChange(self: *ShadowRoot, callback: ?js.Function.Global, frame: *Frame) !void {if (callback) |cb| {- try frame._event_target_attr_listeners.put(frame.arena, .{ .target = self.asEventTarget(), .handler = .onslotchange }, cb);+ try frame._event_target_attr_listeners.put(frame.page_arena, .{ .target = self.asEventTarget(), .handler = .onslotchange }, cb);} else {_ = frame._event_target_attr_listeners.remove(.{ .target = self.asEventTarget(), .handler = .onslotchange });}@@ -173,7 +173,7 @@ pub fn getElementById(self: *ShadowRoot, id: []const u8, frame: *Frame) ?*Elemen// if it really failed, then we're out of memory and nothing's// going to work like it should anyways.const owned_id = frame.dupeString(id) catch return null;- self._elements_by_id.put(frame.arena, owned_id, el) catch return null;+ self._elements_by_id.put(frame.page_arena, owned_id, el) catch return null;return el;}}diff --git a/src/browser/webapi/SharedWorker.zig b/src/browser/webapi/SharedWorker.zigindex e0bd6847f..0f599f18a 100644--- a/src/browser/webapi/SharedWorker.zig+++ b/src/browser/webapi/SharedWorker.zig@@ -77,7 +77,7 @@ pub fn init(url: []const u8, name_or_options: ?NameOrOpts, frame: *Frame) !*Sharerrdefer s.deinit();const page = frame.page;- try page.shared_workers.append(page.frame_arena, s);+ try page.shared_workers.append(page.arena, s);errdefer _ = page.shared_workers.pop();try s.register(lookup_key);diff --git a/src/browser/webapi/Timers.zig b/src/browser/webapi/Timers.zigindex 8d3b10e86..e9dfb0b4c 100644--- a/src/browser/webapi/Timers.zig+++ b/src/browser/webapi/Timers.zig@@ -121,7 +121,7 @@ pub fn schedule(persisted_params = try arena.dupe(js.Value.Global, opts.params);}- const gop = try self._callbacks.getOrPut(exec.arena, timer_id);+ const gop = try self._callbacks.getOrPut(exec.page_arena, timer_id);if (gop.found_existing) {// 2^31 would have to wrap for this to happen.return error.TooManyTimeout;diff --git a/src/browser/webapi/Window.zig b/src/browser/webapi/Window.zigindex 64942f43e..5a5b3e633 100644--- a/src/browser/webapi/Window.zig+++ b/src/browser/webapi/Window.zig@@ -171,7 +171,7 @@ pub fn getName(self: *const Window) []const u8 {pub fn setName(self: *Window, name: []const u8, frame: *Frame) !void {// Store in the Page's frame arena so the slice outlives any call_arena.- self._name = try frame.arena.dupe(u8, name);+ self._name = try frame.page_arena.dupe(u8, name);}pub fn getTop(self: *Window, frame: *Frame) Access {@@ -459,7 +459,7 @@ fn getOnClick(self: *Window) ?js.Function.Global {fn setOnClick(self: *Window, setter: ?FunctionSetter) !void {if (getFunctionFromSetter(setter)) |cb| {- try self._frame._event_target_attr_listeners.put(self._frame.arena, .{ .target = self.asEventTarget(), .handler = .onclick }, cb);+ try self._frame._event_target_attr_listeners.put(self._frame.page_arena, .{ .target = self.asEventTarget(), .handler = .onclick }, cb);} else {_ = self._frame._event_target_attr_listeners.remove(.{ .target = self.asEventTarget(), .handler = .onclick });}@@ -672,7 +672,7 @@ pub fn getComputedStyle(_: *const Window, element: *Element, pseudo_element: ?[]// common probesconst pseudo = Element.PseudoElement.parse(pseudo_element orelse "");const page = frame.page;- const gop = try page.element_computed_styles.getOrPut(page.frame_arena, .{ .element = element, .pseudo = pseudo });+ const gop = try page.element_computed_styles.getOrPut(page.arena, .{ .element = element, .pseudo = pseudo });if (!gop.found_existing) {if (pseudo == .other) {log.debug(.not_implemented, "window.GetComputedStyle", .{ .pseudo_element = pseudo_element.? });@@ -813,7 +813,7 @@ pub fn close(self: *Window) void {// freeing workers and iframes), but, for now, we don't have the// infrastructure to do this safely so doing it on page tear down is our// only option.- page.closed_frames.append(page.frame_arena, frame) catch @panic("OOM");+ page.closed_frames.append(page.arena, frame) catch @panic("OOM");}pub fn focus(_: *Window) void {}diff --git a/src/browser/webapi/canvas/context2d.zig b/src/browser/webapi/canvas/context2d.zigindex 7080f694d..61d47a3c6 100644--- a/src/browser/webapi/canvas/context2d.zig+++ b/src/browser/webapi/canvas/context2d.zig@@ -87,7 +87,7 @@ pub const State = struct {self.font_len = @intCast(value.len);self.font_overflow = null;} else {- self.font_overflow = try exec.arena.dupe(u8, value);+ self.font_overflow = try exec.page_arena.dupe(u8, value);}self.font_size = size;}@@ -115,7 +115,7 @@ pub const State = struct {self.dash_overflow = null;return;}- const dash = try exec.arena.alloc(f64, len);+ const dash = try exec.page_arena.alloc(f64, len);for (0..repeat) |i| @memcpy(dash[i * segments.len ..][0..segments.len], segments);self.dash_overflow = dash;}diff --git a/src/browser/webapi/collections/node_live.zig b/src/browser/webapi/collections/node_live.zigindex d7b739ce4..bfaf033ee 100644--- a/src/browser/webapi/collections/node_live.zig+++ b/src/browser/webapi/collections/node_live.zig@@ -495,7 +495,7 @@ test "NodeLive: indexed reads stay linear" {fn buildSpans(frame: *Frame, count: usize) !*Node {const div = try frame.window._document.createElement("div", null, frame);- const html = try frame.arena.alloc(u8, count * "<span></span>".len);+ const html = try frame.page_arena.alloc(u8, count * "<span></span>".len);var i: usize = 0;while (i < html.len) : (i += "<span></span>".len) {@memcpy(html[i..][0.."<span></span>".len], "<span></span>");diff --git a/src/browser/webapi/css/CSSRuleList.zig b/src/browser/webapi/css/CSSRuleList.zigindex 38cc9475d..6191b437f 100644--- a/src/browser/webapi/css/CSSRuleList.zig+++ b/src/browser/webapi/css/CSSRuleList.zig@@ -31,7 +31,7 @@ pub fn insert(self: *CSSRuleList, index: u32, rule: *CSSRule, frame: *Frame) !voif (index > self._rules.items.len) {return error.IndexSizeError;}- try self._rules.insert(frame.arena, index, rule);+ try self._rules.insert(frame.page_arena, index, rule);}pub fn remove(self: *CSSRuleList, index: u32) !void {diff --git a/src/browser/webapi/css/CSSStyleDeclaration.zig b/src/browser/webapi/css/CSSStyleDeclaration.zigindex a9a06ace0..4edfbb7a5 100644--- a/src/browser/webapi/css/CSSStyleDeclaration.zig+++ b/src/browser/webapi/css/CSSStyleDeclaration.zig@@ -288,7 +288,7 @@ fn setPropertyImpl(self: *CSSStyleDeclaration, property_name: []const u8, value:// Create new propertyconst prop = try frame._factory.create(Property{._node = .{},- ._name = try String.init(frame.arena, normalized, .{}),+ ._name = try String.init(frame.page_arena, normalized, .{}),._value = try initOwnedString(frame._factory.storageAllocator(), normalized_value),._important = important,});diff --git a/src/browser/webapi/css/MediaQueryList.zig b/src/browser/webapi/css/MediaQueryList.zigindex 1b3ee9901..548a13776 100644--- a/src/browser/webapi/css/MediaQueryList.zig+++ b/src/browser/webapi/css/MediaQueryList.zig@@ -45,7 +45,7 @@ pub fn init(query: []const u8, frame: *Frame) !*MediaQueryList {._frame = frame,._matches = MediaQuery.matches(media, frame.page.getViewport()),});- try frame._media_query_lists.append(frame.arena, self);+ try frame._media_query_lists.append(frame.page_arena, self);return self;}diff --git a/src/browser/webapi/css/StyleSheetList.zig b/src/browser/webapi/css/StyleSheetList.zigindex 6a8678458..9b8a5b7de 100644--- a/src/browser/webapi/css/StyleSheetList.zig+++ b/src/browser/webapi/css/StyleSheetList.zig@@ -26,7 +26,7 @@ pub fn item(self: *const StyleSheetList, index: usize) ?*CSSStyleSheet {}pub fn add(self: *StyleSheetList, sheet: *CSSStyleSheet, frame: *Frame) !void {- try self._sheets.append(frame.arena, sheet);+ try self._sheets.append(frame.page_arena, sheet);}pub fn remove(self: *StyleSheetList, sheet: *CSSStyleSheet) void {diff --git a/src/browser/webapi/element/Attribute.zig b/src/browser/webapi/element/Attribute.zigindex d0dd77001..09cb04e02 100644--- a/src/browser/webapi/element/Attribute.zig+++ b/src/browser/webapi/element/Attribute.zig@@ -66,7 +66,7 @@ pub fn getValue(self: *const Attribute) String {pub fn setValue(self: *Attribute, data_: ?String, frame: *Frame) !void {const data = data_ orelse String.empty;const el = self._element orelse {- self._value = try data.dupe(frame.arena);+ self._value = try data.dupe(frame.page_arena);return;};// this takes ownership of the data@@ -210,7 +210,7 @@ pub const List = struct {// *Attribute until the attribute is removed.pub fn getOrCreateAttribute(self: *const List, entry: *const Entry, element: *Element, frame: *Frame) !*Attribute {const page = frame.page;- const gop = try page.attribute_lookup.getOrPut(page.frame_arena, .{ .list = self, .name = entry._name_ptr });+ const gop = try page.attribute_lookup.getOrPut(page.arena, .{ .list = self, .name = entry._name_ptr });if (!gop.found_existing) {gop.value_ptr.* = try entry.toAttribute(element, element.ownerFrame(frame) orelse frame);}@@ -311,7 +311,7 @@ pub const List = struct {const name = try self.put(attribute._name, attribute._value, element, frame);attribute._element = element;const page = frame.page;- try page.attribute_lookup.put(page.frame_arena, .{ .list = self, .name = name.ptr }, attribute);+ try page.attribute_lookup.put(page.arena, .{ .list = self, .name = name.ptr }, attribute);return existing_attribute;}@@ -403,9 +403,9 @@ pub const List = struct {return;}if (self._cap == 0) {- self._entries = (try frame.arena.alloc(Entry, new_cap)).ptr;+ self._entries = (try frame.page_arena.alloc(Entry, new_cap)).ptr;} else {- self._entries = (try frame.arena.realloc(self._entries[0..self._cap], new_cap)).ptr;+ self._entries = (try frame.page_arena.realloc(self._entries[0..self._cap], new_cap)).ptr;}self._cap = new_cap;}@@ -552,9 +552,9 @@ fn canonicalizeName(name: []const u8, frame: *Frame) ![]const u8 {return static;}const page = frame.page;- const gop = try page.attribute_names.getOrPut(page.frame_arena, name);+ const gop = try page.attribute_names.getOrPut(page.arena, name);if (!gop.found_existing) {- gop.key_ptr.* = try page.frame_arena.dupe(u8, name);+ gop.key_ptr.* = try page.arena.dupe(u8, name);}return gop.key_ptr.*;}diff --git a/src/browser/webapi/element/Html.zig b/src/browser/webapi/element/Html.zigindex 1cff27706..d648e3684 100644--- a/src/browser/webapi/element/Html.zig+++ b/src/browser/webapi/element/Html.zig@@ -688,7 +688,7 @@ fn setAttributeListener(}if (listener_callback) |cb| {- try frame._event_target_attr_listeners.put(frame.arena, .{+ try frame._event_target_attr_listeners.put(frame.page_arena, .{.target = self.asEventTarget(),.handler = listener_type,}, cb);diff --git a/src/browser/webapi/element/html/Base.zig b/src/browser/webapi/element/html/Base.zigindex a057865f4..01a01b20b 100644--- a/src/browser/webapi/element/html/Base.zig+++ b/src/browser/webapi/element/html/Base.zig@@ -99,7 +99,7 @@ fn updateBaseURL(self: *Base, frame: *Frame) !void {return;}}- owner.base_url = try owner.arena.dupeSentinel(u8, resolved, 0);+ owner.base_url = try owner.page_arena.dupeSentinel(u8, resolved, 0);}pub const JsApi = struct {diff --git a/src/browser/webapi/element/html/Custom.zig b/src/browser/webapi/element/html/Custom.zigindex c96ef9664..fa5c83490 100644--- a/src/browser/webapi/element/html/Custom.zig+++ b/src/browser/webapi/element/html/Custom.zig@@ -89,7 +89,7 @@ pub fn enqueueConnectedCallbackOnElement(comptime from_parser: bool, element: *Eif (!custom._upgrade_candidate) {custom._upgrade_candidate = true;- try frame._undefined_custom_elements.append(frame.arena, custom);+ try frame._undefined_custom_elements.append(frame.page_arena, custom);}return;}@@ -110,13 +110,13 @@ pub fn enqueueConnectedCallbackOnElement(comptime from_parser: bool, element: *Eif (comptime from_parser) {// From parser, we know the element is brand new; skip the dedup check.try frame._customized_builtin_connected_callback_invoked.put(- frame.arena,+ frame.page_arena,element,{},);} else {const gop = try frame._customized_builtin_connected_callback_invoked.getOrPut(- frame.arena,+ frame.page_arena,element,);if (gop.found_existing) {@@ -146,7 +146,7 @@ pub fn enqueueDisconnectedCallbackOnElement(element: *Element, frame: *Frame) vo}const gop = frame._customized_builtin_disconnected_callback_invoked.getOrPut(- frame.arena,+ frame.page_arena,element,) catch return;if (gop.found_existing) return;diff --git a/src/browser/webapi/element/html/Input.zig b/src/browser/webapi/element/html/Input.zigindex bdde7395a..8bfc464f1 100644--- a/src/browser/webapi/element/html/Input.zig+++ b/src/browser/webapi/element/html/Input.zig@@ -335,7 +335,7 @@ fn replaceFiles(self: *Input, files: []const *File, frame: *Frame) !void {}const fl = try self.ensureFileList(frame);- const dupe = try frame.arena.dupe(*File, files);+ const dupe = try frame.page_arena.dupe(*File, files);for (dupe) |file| {file._proto.acquireRef();@@ -838,7 +838,7 @@ fn sanitizeValue(self: *Input, comptime dupe: bool, value: []const u8, frame: *Fbreak :blk if (comptime dupe) try frame.dupeString(value) else value;};- var result = try frame.arena.alloc(u8, value.len);+ var result = try frame.page_arena.alloc(u8, value.len);@memcpy(result[0..first], value[0..first]);var i: usize = first;@@ -860,7 +860,7 @@ fn sanitizeValue(self: *Input, comptime dupe: bool, value: []const u8, frame: *F.month => return if (isValidMonth(value)) if (comptime dupe) try frame.dupeString(value) else value else "",.week => return if (isValidWeek(value)) if (comptime dupe) try frame.dupeString(value) else value else "",.time => return if (isValidTime(value)) if (comptime dupe) try frame.dupeString(value) else value else "",- .@"datetime-local" => return try sanitizeDatetimeLocal(dupe, value, frame.arena),+ .@"datetime-local" => return try sanitizeDatetimeLocal(dupe, value, frame.page_arena),.number => return if (isValidFloatingPoint(value)) if (comptime dupe) try frame.dupeString(value) else value else "",.range => {const value_attr = self.asConstElement().getAttributeInterned("value") orelse "";@@ -882,7 +882,7 @@ fn sanitizeValue(self: *Input, comptime dupe: bool, value: []const u8, frame: *F}// Normalize to lowercase per spec- const result = try frame.arena.alloc(u8, 7);+ const result = try frame.page_arena.alloc(u8, 7);result[0] = '#';for (value[1..], 1..) |c, j| {result[j] = std.ascii.toLower(c);@@ -1391,7 +1391,7 @@ fn sanitizeRange(0;if (!isValidFloatingPoint(value)) {- return try formatFloat(frame.arena, snapToStep(min + (max - min) / 2, min, max, step_base, step_attr));+ return try formatFloat(frame.page_arena, snapToStep(min + (max - min) / 2, min, max, step_base, step_attr));}const v0 = std.fmt.parseFloat(f64, value) catch unreachable; // grammar already validated@@ -1404,7 +1404,7 @@ fn sanitizeRange(// assignments like `el.value = "1.0"` round-trip without canonicalizing.return if (comptime dupe) try frame.dupeString(value) else value;}- return try formatFloat(frame.arena, snapped);+ return try formatFloat(frame.page_arena, snapped);}/// Snap `value` (already clamped to `[min, max]`) to the nearest value on the@@ -1638,7 +1638,7 @@ pub const Build = struct {switch (attribute) {.type => try self.changeType(Type.fromString(value.str()), frame),.value => {- self._default_value = try frame.arena.dupe(u8, value.str());+ self._default_value = try frame.page_arena.dupe(u8, value.str());if (self._value_dirty == false and self._input_type.valueMode() == .value) {try self.syncValueFromAttribute(frame);}diff --git a/src/browser/webapi/element/html/Slot.zig b/src/browser/webapi/element/html/Slot.zigindex 42542f91d..694ace821 100644--- a/src/browser/webapi/element/html/Slot.zig+++ b/src/browser/webapi/element/html/Slot.zig@@ -146,7 +146,7 @@ pub fn assign(self: *Slot, values: []const js.Value, frame: *Frame) !void {self._manually_assigned.clearRetainingCapacity();for (nodes) |node| {- const gop = try page._manual_slot_assignments.getOrPut(page.frame_arena, node);+ const gop = try page._manual_slot_assignments.getOrPut(page.arena, node);if (gop.found_existing) {const other = gop.value_ptr.*;if (other == self) {@@ -162,7 +162,7 @@ pub fn assign(self: *Slot, values: []const js.Value, frame: *Frame) !void {}}gop.value_ptr.* = self;- try self._manually_assigned.append(frame.arena, node);+ try self._manually_assigned.append(frame.page_arena, node);}if (self.asNode().containingShadowRoot()) |shadow_root| {diff --git a/src/browser/webapi/element/html/TextArea.zig b/src/browser/webapi/element/html/TextArea.zigindex 7c438ccb4..a44a4b419 100644--- a/src/browser/webapi/element/html/TextArea.zig+++ b/src/browser/webapi/element/html/TextArea.zig@@ -90,7 +90,7 @@ pub fn setValue(self: *TextArea, value: []const u8, frame: *Frame) !void {self._user_edited = false;return;}- const owned = try frame.arena.dupe(u8, value);+ const owned = try frame.page_arena.dupe(u8, value);self._value = owned;self._user_edited = false;diff --git a/src/browser/webapi/element/popover.zig b/src/browser/webapi/element/popover.zigindex de1a62128..3a7474cf0 100644--- a/src/browser/webapi/element/popover.zig+++ b/src/browser/webapi/element/popover.zig@@ -78,7 +78,7 @@ pub fn show(el: *Element, frame: *Frame) !void {}}- try frame.document._open_popovers.append(frame.arena, el);+ try frame.document._open_popovers.append(frame.page_arena, el);frame.domChanged();_ = try fireToggle(el, comptime .wrap("toggle"), "closed", "open", false, frame);}diff --git a/src/browser/webapi/element/slotting.zig b/src/browser/webapi/element/slotting.zigindex 5e28abfb5..27914eebe 100644--- a/src/browser/webapi/element/slotting.zig+++ b/src/browser/webapi/element/slotting.zig@@ -140,9 +140,9 @@ fn _assignSlottables(slot: *Slot, frame: *Frame) !void {}}slot._assigned.clearRetainingCapacity();- try slot._assigned.appendSlice(frame.arena, slottables.items);+ try slot._assigned.appendSlice(frame.page_arena, slottables.items);for (slottables.items) |node| {- try page._assigned_slots.put(page.frame_arena, node, slot);+ try page._assigned_slots.put(page.arena, node, slot);node._flags.assigned_slot = true;}}diff --git a/src/browser/webapi/geolocation/Geolocation.zig b/src/browser/webapi/geolocation/Geolocation.zigindex 0d70fe223..6d49f4575 100644--- a/src/browser/webapi/geolocation/Geolocation.zig+++ b/src/browser/webapi/geolocation/Geolocation.zig@@ -103,7 +103,7 @@ fn request(errdefer exec._factory.destroy(req);if (watch_id != 0) {- try self._watches.append(exec.arena, req);+ try self._watches.append(exec.page_arena, req);}errdefer if (watch_id != 0) {_ = self._watches.pop();diff --git a/src/browser/webapi/net/Headers.zig b/src/browser/webapi/net/Headers.zigindex fe442be70..c8d2291f3 100644--- a/src/browser/webapi/net/Headers.zig+++ b/src/browser/webapi/net/Headers.zig@@ -47,14 +47,14 @@ pub fn initGuarded(opts_: ?InitOpts, guard: Guard, exec: *const Execution) !*Heavar list = blk: {const opts = opts_ orelse break :blk KeyValueList.init();switch (opts) {- .obj => |obj| break :blk try KeyValueList.copy(exec.arena, obj._list),+ .obj => |obj| break :blk try KeyValueList.copy(exec.page_arena, obj._list),.js_obj => |js_obj| {- var list = try KeyValueList.fromJsObject(exec.arena, js_obj, normalizeHeaderName, exec.buf);+ var list = try KeyValueList.fromJsObject(exec.page_arena, js_obj, normalizeHeaderName, exec.buf);try validateAndNormalize(&list);break :blk list;},.strings => |kvs| {- var list = try KeyValueList.fromArray(exec.arena, kvs, normalizeHeaderName, exec.buf);+ var list = try KeyValueList.fromArray(exec.page_arena, kvs, normalizeHeaderName, exec.buf);try validateAndNormalize(&list);break :blk list;},@@ -237,7 +237,7 @@ pub fn append(self: *Headers, name: []const u8, value: []const u8, exec: *constif (try self.checkGuard(normalized_name, combined) == .ignore) {return;}- try self._list.append(exec.arena, normalized_name, normalized_value);+ try self._list.append(exec.page_arena, normalized_name, normalized_value);}pub fn delete(self: *Headers, name: []const u8, exec: *const Execution) !void {@@ -276,7 +276,7 @@ pub fn set(self: *Headers, name: []const u8, value_: []const u8, exec: *const Exif (try self.checkGuard(normalized_name, value) == .ignore) {return;}- try self._list.set(exec.arena, normalized_name, value);+ try self._list.set(exec.page_arena, normalized_name, value);}pub fn keys(self: *Headers, exec: *const js.Execution) !*KeyIterator {diff --git a/src/browser/webapi/net/Response.zig b/src/browser/webapi/net/Response.zigindex 92e70bfaf..394afc4b6 100644--- a/src/browser/webapi/net/Response.zig+++ b/src/browser/webapi/net/Response.zig@@ -486,15 +486,15 @@ const StreamConsumer = struct {const reader = try stream.getReader(exec);- const state = try exec.arena.create(StreamConsumer);+ const state = try exec.page_arena.create(StreamConsumer);state.* = .{.execution = exec,.kind = kind,- .content_type = if (content_type) |ct| try exec.arena.dupe(u8, ct) else null,+ .content_type = if (content_type) |ct| try exec.page_arena.dupe(u8, ct) else null,.reader = reader,.chunks = .empty,.total_len = 0,- .arena = exec.arena,+ .arena = exec.page_arena,.resolver = try resolver.persist(),};diff --git a/src/browser/webapi/storage/idb/IDBKeyRange.zig b/src/browser/webapi/storage/idb/IDBKeyRange.zigindex 3d13d25a0..64bd3d385 100644--- a/src/browser/webapi/storage/idb/IDBKeyRange.zig+++ b/src/browser/webapi/storage/idb/IDBKeyRange.zig@@ -48,23 +48,23 @@ fn create(exec: *Execution, lower: ?[]const u8, upper: ?[]const u8, lower_open:}pub fn only(value: js.Value, exec: *Execution) !*IDBKeyRange {- const encoded = try Key.encodeValue(exec.arena, value);+ const encoded = try Key.encodeValue(exec.page_arena, value);return create(exec, encoded, encoded, false, false);}fn lowerBound(value: js.Value, open: ?bool, exec: *Execution) !*IDBKeyRange {- const encoded = try Key.encodeValue(exec.arena, value);+ const encoded = try Key.encodeValue(exec.page_arena, value);return create(exec, encoded, null, open orelse false, false);}fn upperBound(value: js.Value, open: ?bool, exec: *Execution) !*IDBKeyRange {- const encoded = try Key.encodeValue(exec.arena, value);+ const encoded = try Key.encodeValue(exec.page_arena, value);return create(exec, null, encoded, false, open orelse false);}fn bound(lower: js.Value, upper: js.Value, lower_open: ?bool, upper_open: ?bool, exec: *Execution) !*IDBKeyRange {- const lo = try Key.encodeValue(exec.arena, lower);- const up = try Key.encodeValue(exec.arena, upper);+ const lo = try Key.encodeValue(exec.page_arena, lower);+ const up = try Key.encodeValue(exec.page_arena, upper);if (std.mem.order(u8, lo, up) == .gt) {return error.DataError;}diff --git a/src/browser/webapi/streams/ReadableStream.zig b/src/browser/webapi/streams/ReadableStream.zigindex efc166bc9..3fc52d9cf 100644--- a/src/browser/webapi/streams/ReadableStream.zig+++ b/src/browser/webapi/streams/ReadableStream.zig@@ -341,7 +341,7 @@ const PipeState = struct {exec: *const Execution,) !void {const reader = try stream.getReader(exec);- const state = try exec.arena.create(PipeState);+ const state = try exec.page_arena.create(PipeState);state.* = .{.execution = exec,.reader = reader,diff --git a/src/browser/webapi/streams/ReadableStreamDefaultController.zig b/src/browser/webapi/streams/ReadableStreamDefaultController.zigindex 60d8a117f..aff7840e7 100644--- a/src/browser/webapi/streams/ReadableStreamDefaultController.zig+++ b/src/browser/webapi/streams/ReadableStreamDefaultController.zig@@ -56,7 +56,7 @@ pub fn init(stream: *ReadableStream, high_water_mark: u32, exec: *const Executio._queue = .empty,._stream = stream,._execution = exec,- ._arena = exec.arena,+ ._arena = exec.page_arena,._pending_reads = .empty,._high_water_mark = high_water_mark,});diff --git a/src/browser/webapi/svg/AnimatedEnumeration.zig b/src/browser/webapi/svg/AnimatedEnumeration.zigindex c1050bea1..a0522f8d7 100644--- a/src/browser/webapi/svg/AnimatedEnumeration.zig+++ b/src/browser/webapi/svg/AnimatedEnumeration.zig@@ -125,7 +125,7 @@ pub const Lookup = std.AutoHashMapUnmanaged(Key, *AnimatedEnumeration);pub fn getOrCreate(element: *Element, kind: Kind, frame: *Frame) !*AnimatedEnumeration {const key: Key = .{ .element = element, .kind = kind };const page = frame.page;- const gop = try page.svg_animated_enumerations.getOrPut(page.frame_arena, key);+ const gop = try page.svg_animated_enumerations.getOrPut(page.arena, key);if (!gop.found_existing) {errdefer _ = page.svg_animated_enumerations.remove(key);gop.value_ptr.* = try create(diff --git a/src/browser/webapi/svg/AnimatedLength.zig b/src/browser/webapi/svg/AnimatedLength.zigindex 861bf2e3a..aa704822d 100644--- a/src/browser/webapi/svg/AnimatedLength.zig+++ b/src/browser/webapi/svg/AnimatedLength.zig@@ -194,7 +194,7 @@ pub fn getOrCreate(element: *Element, kind: Kind, frame: *Frame) !*AnimatedLengt.kind = kind,};const page = frame.page;- const gop = try page.svg_animated_lengths.getOrPut(page.frame_arena, key);+ const gop = try page.svg_animated_lengths.getOrPut(page.arena, key);if (!gop.found_existing) {errdefer _ = page.svg_animated_lengths.remove(key);gop.value_ptr.* = try createConfigured(diff --git a/src/browser/webapi/svg/AnimatedNumber.zig b/src/browser/webapi/svg/AnimatedNumber.zigindex 9ff719c95..aaf4b74e2 100644--- a/src/browser/webapi/svg/AnimatedNumber.zig+++ b/src/browser/webapi/svg/AnimatedNumber.zig@@ -58,7 +58,7 @@ pub const Lookup = std.AutoHashMapUnmanaged(Key, *AnimatedNumber);pub fn getOrCreate(element: *Element, kind: Kind, frame: *Frame) !*AnimatedNumber {const key: Key = .{ .element = element, .kind = kind };const page = frame.page;- const gop = try page.svg_animated_numbers.getOrPut(page.frame_arena, key);+ const gop = try page.svg_animated_numbers.getOrPut(page.arena, key);if (!gop.found_existing) {errdefer _ = page.svg_animated_numbers.remove(key);gop.value_ptr.* = try frame._factory.create(AnimatedNumber{diff --git a/src/browser/webapi/svg/AnimatedPreserveAspectRatio.zig b/src/browser/webapi/svg/AnimatedPreserveAspectRatio.zigindex 654ad4431..c41e205f1 100644--- a/src/browser/webapi/svg/AnimatedPreserveAspectRatio.zig+++ b/src/browser/webapi/svg/AnimatedPreserveAspectRatio.zig@@ -32,7 +32,7 @@ pub const Lookup = std.AutoHashMapUnmanaged(*Element, *AnimatedPreserveAspectRatpub fn getOrCreate(element: *Element, frame: *Frame) !*AnimatedPreserveAspectRatio {const page = frame.page;- const gop = try page.svg_animated_preserve_aspect_ratios.getOrPut(page.frame_arena, element);+ const gop = try page.svg_animated_preserve_aspect_ratios.getOrPut(page.arena, element);if (!gop.found_existing) {errdefer _ = page.svg_animated_preserve_aspect_ratios.remove(element);gop.value_ptr.* = try create(element, frame);diff --git a/src/browser/webapi/svg/AnimatedString.zig b/src/browser/webapi/svg/AnimatedString.zigindex ea104a27b..5ad1e9a75 100644--- a/src/browser/webapi/svg/AnimatedString.zig+++ b/src/browser/webapi/svg/AnimatedString.zig@@ -42,7 +42,7 @@ pub const Key = struct {pub fn getOrCreate(element: *Element, kind: Kind, frame: *Frame) !*AnimatedString {const key: Key = .{ .element = element, .kind = kind };const page = frame.page;- const gop = try page.svg_animated_strings.getOrPut(page.frame_arena, key);+ const gop = try page.svg_animated_strings.getOrPut(page.arena, key);if (!gop.found_existing) {errdefer _ = page.svg_animated_strings.remove(key);gop.value_ptr.* = try frame._factory.create(AnimatedString{diff --git a/src/browser/webapi/svg/AnimatedTransformList.zig b/src/browser/webapi/svg/AnimatedTransformList.zigindex 5f6d06f24..fdc21ff88 100644--- a/src/browser/webapi/svg/AnimatedTransformList.zig+++ b/src/browser/webapi/svg/AnimatedTransformList.zig@@ -54,7 +54,7 @@ pub const Lookup = std.AutoHashMapUnmanaged(Key, *AnimatedTransformList);pub fn getOrCreate(element: *Element, kind: Kind, frame: *Frame) !*AnimatedTransformList {const key: Key = .{ .element = element, .kind = kind };const page = frame.page;- const gop = try page.svg_animated_transform_lists.getOrPut(page.frame_arena, key);+ const gop = try page.svg_animated_transform_lists.getOrPut(page.arena, key);if (!gop.found_existing) {errdefer _ = page.svg_animated_transform_lists.remove(key);gop.value_ptr.* = try createForAttribute(element, kind.attributeName(), frame);diff --git a/src/browser/webapi/svg/PointList.zig b/src/browser/webapi/svg/PointList.zigindex 862086222..f31f37e6d 100644--- a/src/browser/webapi/svg/PointList.zig+++ b/src/browser/webapi/svg/PointList.zig@@ -62,7 +62,7 @@ pub fn getOrCreate(element: *Element, kind: Kind, frame: *Frame) !*PointList {.kind = kind,};const page = frame.page;- const gop = try page._svg_point_lists.getOrPut(page.frame_arena, key);+ const gop = try page._svg_point_lists.getOrPut(page.arena, key);if (!gop.found_existing) {errdefer _ = page._svg_point_lists.remove(key);gop.value_ptr.* = try frame._factory.create(PointList{diff --git a/src/browser/webapi/svg/StringList.zig b/src/browser/webapi/svg/StringList.zigindex 7dd44d2f1..d1c01a3e6 100644--- a/src/browser/webapi/svg/StringList.zig+++ b/src/browser/webapi/svg/StringList.zig@@ -69,7 +69,7 @@ pub fn getOrCreate(element: *Element, kind: Kind, frame: *Frame) !*StringList {.kind = kind,};const page = frame.page;- const gop = try page._svg_string_lists.getOrPut(page.frame_arena, key);+ const gop = try page._svg_string_lists.getOrPut(page.arena, key);if (!gop.found_existing) {errdefer _ = page._svg_string_lists.remove(key);gop.value_ptr.* = try frame._factory.create(StringList{@@ -180,10 +180,10 @@ fn commit(self: *StringList, items: []const []const u8, frame: *Frame) !void {try self._element.setAttributeSafe(self._attribute_name, .wrap(bytes), frame);self._present = true;self._snapshot.clearRetainingCapacity();- try self._snapshot.appendSlice(frame.arena, bytes);+ try self._snapshot.appendSlice(frame.page_arena, bytes);self._items.clearRetainingCapacity();for (bounds) |bound| {- try self._items.append(frame.arena, self._snapshot.items[bound[0]..bound[1]]);+ try self._items.append(frame.page_arena, self._snapshot.items[bound[0]..bound[1]]);}self._synced = true;}@@ -195,18 +195,18 @@ fn rebuild(self: *StringList, raw: ?[]const u8, frame: *Frame) !void {self._items.clearRetainingCapacity();if (raw) |value| {- try self._snapshot.appendSlice(frame.arena, value);+ try self._snapshot.appendSlice(frame.page_arena, value);switch (self._delimiter) {.whitespace => {var iterator = std.mem.tokenizeAny(u8, self._snapshot.items, WHITESPACE);- while (iterator.next()) |item| try self._items.append(frame.arena, item);+ while (iterator.next()) |item| try self._items.append(frame.page_arena, item);},// A set of comma-separated tokens: every segment is a token, even// an empty one, and each is trimmed of surrounding whitespace..comma => {var iterator = std.mem.splitScalar(u8, self._snapshot.items, ',');while (iterator.next()) |part| {- try self._items.append(frame.arena, std.mem.trim(u8, part, WHITESPACE));+ try self._items.append(frame.page_arena, std.mem.trim(u8, part, WHITESPACE));}},}diff --git a/src/browser/webapi/svg/TransformList.zig b/src/browser/webapi/svg/TransformList.zigindex c920eeae9..c959d2dd6 100644--- a/src/browser/webapi/svg/TransformList.zig+++ b/src/browser/webapi/svg/TransformList.zig@@ -94,7 +94,7 @@ fn consolidate(self: *TransformList, frame: *Frame) !?*Transform {errdefer consolidated.releaseRef(frame.page);try M.retireAll(self, frame);- try self._items.ensureTotalCapacity(frame.arena, 1);+ try self._items.ensureTotalCapacity(frame.page_arena, 1);try M.setAttribute(self, &.{consolidated}, frame);self._items.appendAssumeCapacity(consolidated);attach(self, consolidated);diff --git a/src/browser/webapi/svg/reflected_list.zig b/src/browser/webapi/svg/reflected_list.zigindex 4cd012ce9..c86f7f6ff 100644--- a/src/browser/webapi/svg/reflected_list.zig+++ b/src/browser/webapi/svg/reflected_list.zig@@ -80,7 +80,7 @@ pub fn Mixin(comptime List: type, comptime Item: type, comptime hooks: anytype)errdefer hooks.releaseItem(prepared, frame.page);try retireAll(self, frame);- try self._items.ensureTotalCapacity(frame.arena, 1);+ try self._items.ensureTotalCapacity(frame.page_arena, 1);try setAttribute(self, &.{prepared}, frame);self._items.appendAssumeCapacity(prepared);hooks.attach(self, prepared);@@ -105,7 +105,7 @@ pub fn Mixin(comptime List: type, comptime Item: type, comptime hooks: anytype)next[at] = prepared;@memcpy(next[at + 1 ..], self._items.items[at..]);- try self._items.ensureUnusedCapacity(frame.arena, 1);+ try self._items.ensureUnusedCapacity(frame.page_arena, 1);try setAttribute(self, next, frame);self._items.insertAssumeCapacity(at, prepared);hooks.attach(self, prepared);@@ -122,7 +122,7 @@ pub fn Mixin(comptime List: type, comptime Item: type, comptime hooks: anytype)const next = try frame.local_arena.dupe(*Item, self._items.items);next[index] = prepared;- try self._retired.ensureUnusedCapacity(frame.arena, 1);+ try self._retired.ensureUnusedCapacity(frame.page_arena, 1);try setAttribute(self, next, frame);const replaced = self._items.items[index];hooks.detachItem(replaced, self);@@ -141,7 +141,7 @@ pub fn Mixin(comptime List: type, comptime Item: type, comptime hooks: anytype)@memcpy(next[0..index], self._items.items[0..index]);@memcpy(next[index..], self._items.items[index + 1 ..]);- try self._retired.ensureUnusedCapacity(frame.arena, 1);+ try self._retired.ensureUnusedCapacity(frame.page_arena, 1);try setAttribute(self, next, frame);const removed = self._items.orderedRemove(index);hooks.detachItem(removed, self);@@ -173,9 +173,9 @@ pub fn Mixin(comptime List: type, comptime Item: type, comptime hooks: anytype)errdefer for (parsed.items) |item| hooks.releaseItem(item, frame.page);self._snapshot.clearRetainingCapacity();- try self._snapshot.appendSlice(frame.arena, raw);+ try self._snapshot.appendSlice(frame.page_arena, raw);try retireAll(self, frame);- try self._items.ensureTotalCapacityPrecise(frame.arena, parsed.items.len);+ try self._items.ensureTotalCapacityPrecise(frame.page_arena, parsed.items.len);for (parsed.items) |item| {self._items.appendAssumeCapacity(item);hooks.attach(self, item);@@ -197,7 +197,7 @@ pub fn Mixin(comptime List: type, comptime Item: type, comptime hooks: anytype)pub fn retireAll(self: *List, frame: *Frame) !void {self._synced = false;- try self._retired.ensureUnusedCapacity(frame.arena, self._items.items.len);+ try self._retired.ensureUnusedCapacity(frame.page_arena, self._items.items.len);for (self._items.items) |item| {hooks.detachItem(item, self);self._retired.appendAssumeCapacity(item);@@ -219,7 +219,7 @@ pub fn Mixin(comptime List: type, comptime Item: type, comptime hooks: anytype)self._synced = false;try self._element.setAttributeSafe(hooks.attrName(self), .wrap(serialized), frame);self._snapshot.clearRetainingCapacity();- try self._snapshot.appendSlice(frame.arena, serialized);+ try self._snapshot.appendSlice(frame.page_arena, serialized);self._synced = true;}};