Skip to content

Lightpanda: the headless browser designed for AI and automation

webapi: better frame integrity

Karl Seguin48dc72cd4909
diff --git a/src/NodeRegistry.zig b/src/NodeRegistry.zig
index f0f217f81..c48213d80 100644
--- a/src/NodeRegistry.zig
+++ b/src/NodeRegistry.zig
@@ -68,7 +68,7 @@ pub fn reset(self: *NodeRegistry) void {
/// IDs valid. Must run before the page's arena is freed — attribution reads
/// each node's document.
pub fn resetFrame(self: *NodeRegistry, arena: Allocator, frame: *Frame) void {
- const page = frame._page;
+ const page = frame.page;
var doomed: std.ArrayListUnmanaged(*Node) = .empty;
var it = self.lookup_by_id.valueIterator();
while (it.next()) |node_ptr| {
diff --git a/src/browser/EventManager.zig b/src/browser/EventManager.zig
index d6946fe67..04cd0c119 100644
--- a/src/browser/EventManager.zig
+++ b/src/browser/EventManager.zig
@@ -77,7 +77,7 @@ const DispatchError = EventManagerBase.DispatchError;
pub fn dispatch(self: *EventManager, target: *EventTarget, event: *Event) DispatchError!void {
event.acquireRef();
- defer _ = event.releaseRef(self.frame._page);
+ defer _ = event.releaseRef(self.frame.page);
// Increment event count for Event Timing API
self.frame.window._performance._event_counts.increment(event._type_string.str());
@@ -101,7 +101,7 @@ pub fn dispatch(self: *EventManager, target: *EventTarget, event: *Event) Dispat
/// called preventDefault().
pub fn dispatchCancelable(self: *EventManager, target: *EventTarget, event: *Event) DispatchError!bool {
event.acquireRef();
- defer event.releaseRef(self.frame._page);
+ defer event.releaseRef(self.frame.page);
try self.dispatch(target, event);
return event.getDefaultPrevented();
}
@@ -140,7 +140,7 @@ pub fn dispatchDirect(self: *EventManager, target: *EventTarget, event: *Event,
window._current_event = event;
defer window._current_event = prev_event;
- try self.base.dispatchDirect(frame.call_arena, frame.js, target, event, handler, frame._page, opts);
+ try self.base.dispatchDirect(frame.call_arena, frame.js, target, event, handler, frame.page, opts);
}
/// Check if there are any listeners for a direct dispatch (non-DOM target).
@@ -333,7 +333,7 @@ fn dispatchNode(self: *EventManager, target: *Node, event: *Event) !void {
if (err == error.ExecutionTerminated) {
return error.ExecutionTerminated;
}
- frame._page.recordJsError(err);
+ frame.page.recordJsError(err);
log.warn(.event, "inline handler", .{ .err = err, .caught = caught });
break :ret null;
};
@@ -394,7 +394,7 @@ fn dispatchNode(self: *EventManager, target: *Node, event: *Event) !void {
if (err == error.ExecutionTerminated) {
return error.ExecutionTerminated;
}
- frame._page.recordJsError(err);
+ frame.page.recordJsError(err);
log.warn(.event, "inline handler", .{ .err = err, .caught = caught });
break :ret null;
};
@@ -861,7 +861,7 @@ const ActivationState = struct {
const event = try Event.initTrusted(comptime .wrap(typ), .{
.bubbles = true,
.cancelable = false,
- }, frame._page);
+ }, frame.page);
const target = input.asElement().asEventTarget();
try frame._event_manager.dispatch(target, event);
diff --git a/src/browser/Frame.zig b/src/browser/Frame.zig
index 98792534c..ebf0b9119 100644
--- a/src/browser/Frame.zig
+++ b/src/browser/Frame.zig
@@ -65,15 +65,6 @@ const popover = @import("webapi/element/popover.zig");
const slotting = @import("webapi/element/slotting.zig");
const NavigationKind = @import("webapi/navigation/root.zig").NavigationKind;
-const PointList = @import("webapi/svg/PointList.zig");
-const StringList = @import("webapi/svg/StringList.zig");
-const AnimatedEnumeration = @import("webapi/svg/AnimatedEnumeration.zig");
-const AnimatedLength = @import("webapi/svg/AnimatedLength.zig");
-const AnimatedNumber = @import("webapi/svg/AnimatedNumber.zig");
-const AnimatedString = @import("webapi/svg/AnimatedString.zig");
-const AnimatedTransformList = @import("webapi/svg/AnimatedTransformList.zig");
-const AnimatedPreserveAspectRatio = @import("webapi/svg/AnimatedPreserveAspectRatio.zig");
-
const sys_url = @import("../sys/url.zig");
const HttpClient = @import("../network/HttpClient.zig");
const GlobalScope = @import("global_scope.zig").GlobalScope;
@@ -104,7 +95,7 @@ _frame_id: u32,
// navigate.
_loader_id: u32,
-_page: *Page,
+page: *Page,
_session: *Session,
@@ -118,55 +109,6 @@ _parse_mode: enum { document, fragment, document_write } = .document,
// inserted into a document
_fragment_scripts_runnable: bool = false,
-// See Attribute.List for what this is. TL;DR: proper DOM Attribute Nodes are
-// fat yet rarely needed. We only create them on-demand, but still need proper
-// identity (a given attribute should return the same *Attribute), so we do
-// a look here, keyed by (list, name). We don't store this in the Element or
-// Attribute.List.Entry because that would require additional space per
-// element / Attribute.List.Entry even though we'll create very few (if any)
-// actual *Attributes.
-_attribute_lookup: Element.Attribute.List.Lookup = .empty,
-
-// Canonical pool for attribute names that aren't in String.intern's.
-// Every Attribute's entry's name is either a String intern or held here.
-// This is both a memory optimization (deduping attribute names) and a performance
-// optimization (since we can compare strings by just their pointer)
-_attribute_names: std.StringHashMapUnmanaged(void) = .empty,
-
-// Same as _atlribute_lookup, but instead of individual attributes, this is for
-// the return of elements.attributes.
-_attribute_named_node_map_lookup: std.AutoHashMapUnmanaged(usize, *Element.Attribute.NamedNodeMap) = .empty,
-
-// Lazily-created style, classList, and dataset objects. Only stored for elements
-// that actually access these features via JavaScript, saving 24 bytes per element.
-_element_styles: Element.StyleLookup = .empty,
-// Computed-style views handed out by window.getComputedStyle. The computed
-// variant is a stateless lazy view, so one per (element, pseudo-element)
-// suffices — and Chrome returns the same object for repeated calls, so
-// identity is also conformance.
-_element_computed_styles: Element.ComputedStyleLookup = .empty,
-_element_datasets: Element.DatasetLookup = .empty,
-_element_class_lists: Element.ClassListLookup = .empty,
-_element_rel_lists: Element.RelListLookup = .empty,
-_element_part_lists: Element.PartListLookup = .empty,
-_element_token_lists: Element.TokenListLookup = .empty,
-_element_shadow_roots: Element.ShadowRootLookup = .empty,
-_element_scroll_positions: Element.ScrollPositionLookup = .empty,
-_element_namespace_uris: Element.NamespaceUriLookup = .empty,
-_svg_animated_enumerations: AnimatedEnumeration.Lookup = .empty,
-_svg_animated_lengths: AnimatedLength.Lookup = .empty,
-_svg_animated_numbers: AnimatedNumber.Lookup = .empty,
-_svg_animated_preserve_aspect_ratios: AnimatedPreserveAspectRatio.Lookup = .empty,
-_svg_animated_strings: AnimatedString.Lookup = .empty,
-_svg_animated_transform_lists: AnimatedTransformList.Lookup = .empty,
-_svg_point_lists: PointList.Lookup = .empty,
-_svg_string_lists: StringList.Lookup = .empty,
-
-// Same as above, but for Nodes (slot assigments apply to both Element AND
-// Text nodes)
-_assigned_slots: Node.AssignedSlotLookup = .empty,
-_manual_slot_assignments: Node.AssignedSlotLookup = .empty,
-
/// Lazily-created inline event listeners (or listeners provided as attributes).
/// Avoids bloating all elements with extra function fields for rare usage.
///
@@ -398,6 +340,7 @@ pub fn init(self: *Frame, frame_id: u32, page: *Page, opts: InitOpts) !void {
self.* = .{
.js = undefined,
+ .page = page,
.arena = arena,
.parent = parent,
.document = document,
@@ -407,7 +350,6 @@ pub fn init(self: *Frame, frame_id: u32, page: *Page, opts: InitOpts) !void {
.call_arena = call_arena.allocator(),
.local_arena = local_arena.allocator(),
._frame_id = frame_id,
- ._page = page,
._session = session,
._loader_id = session.nextLoaderId(),
._factory = factory,
@@ -521,7 +463,7 @@ pub fn deinit(self: *Frame) void {
cs.detach();
}
- const page = self._page;
+ const page = self.page;
if (self._queued_navigation) |qn| {
qn.arena.release();
@@ -544,16 +486,6 @@ pub fn deinit(self: *Frame) void {
observers.deinit(self, page);
- var svg_point_lists = self._svg_point_lists.valueIterator();
- while (svg_point_lists.next()) |list| {
- list.*.deinit(page);
- }
-
- var svg_transform_lists = self._svg_animated_transform_lists.valueIterator();
- while (svg_transform_lists.next()) |list| {
- list.*.deinit(page);
- }
-
var document = self.window._document;
document._selection.releaseRef(page);
@@ -722,7 +654,7 @@ pub fn navigate(self: *Frame, request_url: [:0]const u8, opts: NavigateOpts) !vo
const location = try Location.init(self.url, self);
location.acquireRef();
// We're not holding a ref to old location anymore.
- self.window._location.releaseRef(self._page);
+ self.window._location.releaseRef(self.page);
self.window._location = location;
if (is_blob) {
@@ -754,7 +686,7 @@ pub fn navigate(self: *Frame, request_url: [:0]const u8, opts: NavigateOpts) !vo
// Content injection
if (is_blob) {
const blob = blk: {
- if (self._page.blob_urls.get(request_url)) |entry| break :blk entry.blob;
+ if (self.page.blob_urls.get(request_url)) |entry| break :blk entry.blob;
log.warn(.js, "invalid blob", .{ .url = request_url });
return error.BlobNotFound;
};
@@ -903,7 +835,7 @@ pub fn navigate(self: *Frame, request_url: [:0]const u8, opts: NavigateOpts) !vo
// and the in-flight transfer survives the OLD page's frame.deinit which
// calls http_client.abortList() on the shared frame_id during
// commitPendingPage.
- const is_pending_root = self._page.replaces != null;
+ const is_pending_root = self.page.replaces != null;
// We dispatch frame_navigate event before sending the request.
// It ensures the event frame_navigated is not dispatched before this one.
@@ -1031,7 +963,7 @@ fn scheduleNavigationWithArena(originator: *Frame, arena: *lp.Arena, request_url
const location = try Location.init(target.url, target);
location.acquireRef();
- target.window._location.releaseRef(target._page);
+ target.window._location.releaseRef(target.page);
target.window._location = location;
if (target.parent == null) {
@@ -1166,7 +1098,7 @@ pub fn stopLoading(self: *Frame) void {
}
if (self._queued_navigation) |qn| {
- const queued = self._page.queued_navigation;
+ const queued = self.page.queued_navigation;
if (std.mem.indexOfScalar(*Frame, queued.items, self)) |idx| {
_ = queued.swapRemove(idx);
}
@@ -1203,7 +1135,7 @@ pub fn documentIsLoaded(self: *Frame) void {
fn _documentIsLoaded(self: *Frame) !void {
try self.dispatchReadyStateChange();
- const event = try Event.initTrusted(.wrap("DOMContentLoaded"), .{ .bubbles = true }, self._page);
+ const event = try Event.initTrusted(.wrap("DOMContentLoaded"), .{ .bubbles = true }, self.page);
try self._event_manager.dispatch(
self.document.asEventTarget(),
event,
@@ -1222,7 +1154,7 @@ fn _documentIsLoaded(self: *Frame) !void {
// (readiness -> complete). Does not bubble.
// https://html.spec.whatwg.org/multipage/dom.html#current-document-readiness
fn dispatchReadyStateChange(self: *Frame) !void {
- const event = try Event.initTrusted(.wrap("readystatechange"), .{}, self._page);
+ const event = try Event.initTrusted(.wrap("readystatechange"), .{}, self.page);
try self._event_manager.dispatch(
self.document.asEventTarget(),
event,
@@ -1254,7 +1186,7 @@ fn iframeCompletedLoading(self: *Frame, iframe: *IFrame, delays_load: bool) void
defer entered.exit();
blk: {
- const event = Event.initTrusted(comptime .wrap("load"), .{}, self._page) catch |err| {
+ const event = Event.initTrusted(comptime .wrap("load"), .{}, self.page) catch |err| {
log.err(.frame, "iframe event init", .{ .err = err, .url = iframe._src });
break :blk;
};
@@ -1317,7 +1249,7 @@ fn _documentIsComplete(self: *Frame) !void {
// Dispatch window.load event.
const window_target = self.window.asEventTarget();
if (self._event_manager.hasDirectListeners(window_target, "load", self.window._on_load)) {
- const event = try Event.initTrusted(comptime .wrap("load"), .{}, self._page);
+ const event = try Event.initTrusted(comptime .wrap("load"), .{}, self.page);
// This event is weird, it's dispatched directly on the window, but
// with the document as the target.
event._target = self.document.asEventTarget();
@@ -1389,8 +1321,8 @@ fn frameHeaderDoneCallback(transfer: *HttpClient.Transfer) !HttpClient.Transfer.
// frame_remove (clears OLD V8 context group + CDP node_registry),
// tears down the OLD page, flips the pointer, and dispatches
// frame_created against the new (now active) frame.
- if (self._page.replaces != null) {
- try self._session.commitPendingPage(self._page);
+ if (self.page.replaces != null) {
+ try self._session.commitPendingPage(self.page);
}
const response_url = transfer.req.url;
@@ -1423,7 +1355,7 @@ fn frameHeaderDoneCallback(transfer: *HttpClient.Transfer) !HttpClient.Transfer.
// Init new location.
const location = try Location.init(self.url, self);
location.acquireRef();
- self.window._location.releaseRef(self._page);
+ self.window._location.releaseRef(self.page);
self.window._location = location;
if (comptime lp.IS_DEBUG) {
@@ -1890,8 +1822,8 @@ fn frameErrorCallback(ctx: *anyopaque, err: anyerror) void {
// pending Page; the OLD active Page (and its V8 context) is untouched.
// We do NOT run frameDoneCallback against the pending frame — the frame
// is about to be freed.
- if (self._page.replaces != null) {
- self._session.discardPendingPage(self._page);
+ if (self.page.replaces != null) {
+ self._session.discardPendingPage(self.page);
return;
}
@@ -1993,7 +1925,7 @@ pub fn iframeAddedCallback(self: *Frame, iframe: *IFrame) !void {
const new_frame = try self.arena.create(Frame);
const frame_id = session.nextFrameId();
- try Frame.init(new_frame, frame_id, self._page, .{ .parent = self });
+ try Frame.init(new_frame, frame_id, self.page, .{ .parent = self });
errdefer new_frame.deinit();
const delays_load = iframe.isLazyLoading() == false;
@@ -2099,7 +2031,7 @@ const OpenPopupOpts = struct {
// The popup shares the Page's arena, factory, and identity map, but has no
// parent and is not attached to the frame tree — it lives in page.popups.
pub fn openPopup(self: *Frame, opts: OpenPopupOpts) !*Frame {
- const page = self._page;
+ const page = self.page;
const session = self._session;
const resolved_url: [:0]const u8 = blk: {
@@ -2161,7 +2093,7 @@ pub fn openPopup(self: *Frame, opts: OpenPopupOpts) !*Frame {
}
pub fn domChanged(self: *Frame) void {
- self._page.dom_version += 1;
+ self.page.dom_version += 1;
self.styleChanged();
// A DOM change is our "rendering opportunity": re-evaluate the layout
@@ -2173,7 +2105,7 @@ pub fn domChanged(self: *Frame) void {
/// Stamps the cascade: any change that can alter a selector match or cascade
/// result, including non-tree state that live collections never see.
pub fn styleChanged(self: *Frame) void {
- self._page.style_version += 1;
+ self.page.style_version += 1;
}
const ElementIdMaps = struct { lookup: *std.StringHashMapUnmanaged(*Element), removed_ids: *std.StringHashMapUnmanaged(void) };
@@ -2484,7 +2416,7 @@ pub fn loadExternalStylesheet(self: *Frame, link: *Element.Html.Link, href: []co
}
fn fireElementEvent(self: *Frame, el: *Element, name: String) !void {
- const event = try Event.initTrusted(name, .{}, self._page);
+ const event = try Event.initTrusted(name, .{}, self.page);
try self._event_manager.dispatch(el.asEventTarget(), event);
}
@@ -2921,7 +2853,7 @@ fn _insertNodeRelative(self: *Frame, comptime from_parser: bool, parent: *Node,
}
}
- if (self._element_shadow_roots.count() != 0) {
+ if (self.page.element_shadow_roots.count() != 0) {
// html5ever wraps fragment parses in a temporary <html> element that
// gets unwrapped later; it must not take part in slot assignment.
const in_fragment_parse = from_parser and self._parse_mode == .fragment;
@@ -3636,7 +3568,7 @@ pub fn submitForm(self: *Frame, submitter_: ?*Element, form_: ?*Element.Html.For
// so submit_event is still valid when we check _prevent_default
submit_event.acquireRef();
- defer _ = submit_event.releaseRef(self._page);
+ defer _ = submit_event.releaseRef(self.page);
try self._event_manager.dispatch(form_element.asEventTarget(), submit_event);
// If the submit event was prevented, don't submit the form
@@ -3664,7 +3596,7 @@ pub fn submitForm(self: *Frame, submitter_: ?*Element, form_: ?*Element.Html.For
const form_data = try FormData.initWithCharset(form, submitter_, charset, &self.js.execution);
form_data.acquireRef();
- defer form_data.releaseRef(self._page);
+ defer form_data.releaseRef(self.page);
// Per HTML spec form-submission algorithm, when the submitter is a submit
// button, its formaction/formmethod/formenctype attributes override the
diff --git a/src/browser/Page.zig b/src/browser/Page.zig
index 75df14720..ad5f45285 100644
--- a/src/browser/Page.zig
+++ b/src/browser/Page.zig
@@ -27,8 +27,17 @@ const Factory = @import("Factory.zig");
const Viewport = @import("Viewport.zig");
const Blob = @import("webapi/Blob.zig");
+const Node = @import("webapi/Node.zig");
const Element = @import("webapi/Element.zig");
const SharedWorkerGlobalScope = @import("webapi/SharedWorkerGlobalScope.zig");
+const PointList = @import("webapi/svg/PointList.zig");
+const StringList = @import("webapi/svg/StringList.zig");
+const AnimatedEnumeration = @import("webapi/svg/AnimatedEnumeration.zig");
+const AnimatedLength = @import("webapi/svg/AnimatedLength.zig");
+const AnimatedNumber = @import("webapi/svg/AnimatedNumber.zig");
+const AnimatedString = @import("webapi/svg/AnimatedString.zig");
+const AnimatedTransformList = @import("webapi/svg/AnimatedTransformList.zig");
+const AnimatedPreserveAspectRatio = @import("webapi/svg/AnimatedPreserveAspectRatio.zig");
const Allocator = std.mem.Allocator;
@@ -78,6 +87,61 @@ factory: Factory,
_frame_arena: *lp.Arena,
frame_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
+// Frame or Document: the state belongs to the node whichever realm touches
+// it, and follows the node across documents (adoption) with no migration.
+// Nodes live until the Page does, so a key is never reused.
+
+// See Attribute.List for what this is. TL;DR: proper DOM Attribute Nodes are
+// fat yet rarely needed. We only create them on-demand, but still need proper
+// identity (a given attribute should return the same *Attribute), so we do
+// a look here, keyed by (list, name). We don't store this in the Element or
+// Attribute.List.Entry because that would require additional space per
+// element / Attribute.List.Entry even though we'll create very few (if any)
+// actual *Attributes.
+attribute_lookup: Element.Attribute.List.Lookup = .empty,
+
+// Canonical pool for attribute names that aren't in String.intern's.
+// Every Attribute's entry's name is either a String intern or held here.
+// This is both a memory optimization (deduping attribute names) and a performance
+// optimization (since we can compare strings by just their pointer)
+attribute_names: std.StringHashMapUnmanaged(void) = .empty,
+
+// Same as attribute_lookup, but instead of individual attributes, this is for
+// the return of elements.attributes.
+attribute_named_node_map_lookup: std.AutoHashMapUnmanaged(usize, *Element.Attribute.NamedNodeMap) = .empty,
+
+// Lazily-created style, classList, and dataset objects. Only stored for elements
+// that actually access these features via JavaScript, saving 24 bytes per element.
+element_styles: Element.StyleLookup = .empty,
+// Computed-style views handed out by window.getComputedStyle. The computed
+// variant is a stateless lazy view, so one per (element, pseudo-element)
+// suffices — and Chrome returns the same object for repeated calls, so
+// identity is also conformance.
+element_computed_styles: Element.ComputedStyleLookup = .empty,
+element_datasets: Element.DatasetLookup = .empty,
+element_class_lists: Element.ClassListLookup = .empty,
+element_rel_lists: Element.RelListLookup = .empty,
+element_part_lists: Element.PartListLookup = .empty,
+element_token_lists: Element.TokenListLookup = .empty,
+element_shadow_roots: Element.ShadowRootLookup = .empty,
+element_scroll_positions: Element.ScrollPositionLookup = .empty,
+element_namespace_uris: Element.NamespaceUriLookup = .empty,
+svg_animated_enumerations: AnimatedEnumeration.Lookup = .empty,
+svg_animated_lengths: AnimatedLength.Lookup = .empty,
+svg_animated_numbers: AnimatedNumber.Lookup = .empty,
+svg_animated_preserve_aspect_ratios: AnimatedPreserveAspectRatio.Lookup = .empty,
+svg_animated_strings: AnimatedString.Lookup = .empty,
+svg_animated_transform_lists: AnimatedTransformList.Lookup = .empty,
+_svg_point_lists: PointList.Lookup = .empty,
+_svg_string_lists: StringList.Lookup = .empty,
+
+// Same as above, but for Nodes (slot assigments apply to both Element AND
+// Text nodes)
+_assigned_slots: Node.AssignedSlotLookup = .empty,
+_manual_slot_assignments: Node.AssignedSlotLookup = .empty,
+
// Origin map for same-origin context sharing. Entries live for the Page's
// lifetime.
origins: std.StringHashMapUnmanaged(*js.Origin) = .empty,
@@ -204,6 +268,18 @@ pub fn deinit(self: *Page) void {
self.frame.deinit();
+ {
+ var svg_point_lists = self._svg_point_lists.valueIterator();
+ while (svg_point_lists.next()) |list| {
+ list.*.deinit(self);
+ }
+
+ var svg_transform_lists = self.svg_animated_transform_lists.valueIterator();
+ while (svg_transform_lists.next()) |list| {
+ list.*.deinit(self);
+ }
+ }
+
for (self.shared_workers.items) |scope| {
scope.deinit();
}
@@ -439,5 +515,5 @@ test "Page: js_error_count" {
const page = try testing.pageTest("page_js_error.html", .{});
defer page.close();
- try testing.expectEqual(2, page.frame().?._page.js_error_count);
+ try testing.expectEqual(2, page.frame().?.page.js_error_count);
}
diff --git a/src/browser/ScriptManagerBase.zig b/src/browser/ScriptManagerBase.zig
index 097e3f336..b26f118dc 100644
--- a/src/browser/ScriptManagerBase.zig
+++ b/src/browser/ScriptManagerBase.zig
@@ -955,7 +955,7 @@ pub const Script = struct {
const fe = self.extra.frame;
const frame = fe.frame;
const Event = @import("webapi/Event.zig");
- const event = Event.initTrusted(typ, .{}, frame._page) catch |err| {
+ const event = Event.initTrusted(typ, .{}, frame.page) catch |err| {
log.warn(.js, "script internal callback", .{
.url = self.url,
.type = typ,
diff --git a/src/browser/SelectorPath.zig b/src/browser/SelectorPath.zig
index 406b1f9ec..c5713cd51 100644
--- a/src/browser/SelectorPath.zig
+++ b/src/browser/SelectorPath.zig
@@ -170,7 +170,7 @@ fn siblingMatches(self: SelectorPath, el: *Element, sel: []const u8) bool {
fn matchCount(self: SelectorPath, candidate: []const u8) usize {
const root = self.frame.window._document.asNode();
const list = Selector.querySelectorAllUncached(root, candidate, self.frame) catch return 0;
- defer list.deinit(self.frame._page);
+ defer list.deinit(self.frame.page);
return list.getLength();
}
diff --git a/src/browser/Session.zig b/src/browser/Session.zig
index bcfe39048..039c983a4 100644
--- a/src/browser/Session.zig
+++ b/src/browser/Session.zig
@@ -569,7 +569,7 @@ pub fn idleSlice(self: *Session) u31 {
}
pub fn scheduleNavigation(_: *Session, frame: *Frame) !void {
- return frame._page.scheduleNavigation(frame);
+ return frame.page.scheduleNavigation(frame);
}
// Drain one page's queued navigations and return whether any page had work.
@@ -730,7 +730,7 @@ fn _processFrameNavigation(self: *Session, frame: *Frame, qn: *QueuedNavigation)
const frame_id = frame._frame_id;
const reuse_window = frame.window;
- const page = frame._page;
+ const page = frame.page;
frame.js.detachGlobal();
frame.deinit();
frame.* = undefined;
@@ -780,7 +780,7 @@ fn processPopupNavigation(_: *Session, frame: *Frame, qn: *QueuedNavigation) !vo
const saved_name = reuse_window._name;
const saved_opener = reuse_window._opener;
const frame_id = frame._frame_id;
- const page = frame._page;
+ const page = frame.page;
frame.js.detachGlobal();
frame.deinit();
diff --git a/src/browser/StyleManager.zig b/src/browser/StyleManager.zig
index 60a6b453f..79710d2c6 100644
--- a/src/browser/StyleManager.zig
+++ b/src/browser/StyleManager.zig
@@ -158,7 +158,7 @@ fn applyMediaAtRule(self: *StyleManager, build_arena: Allocator, text: []const u
const block = atRuleBlock(text, "@media") orelse return;
const query = std.mem.trim(u8, block.prelude, &std.ascii.whitespace);
- if (MediaQuery.matches(query, self.frame._page.getViewport()) == false) {
+ if (MediaQuery.matches(query, self.frame.page.getViewport()) == false) {
return;
}
@@ -725,7 +725,7 @@ fn anyInChain(self: *StyleManager, el: *Element, comptime what: Probe, options:
/// The memoized own-element result. Callers must have run rebuildIfDirty,
/// which resets the memo.
fn ownProps(self: *StyleManager, el: *Element) Props {
- const version = self.frame._page.style_version;
+ const version = self.frame.page.style_version;
if (self.memo_version != version) {
self.memo.clearRetainingCapacity();
self.memo_version = version;
diff --git a/src/browser/actions.zig b/src/browser/actions.zig
index a60505d04..b62016442 100644
--- a/src/browser/actions.zig
+++ b/src/browser/actions.zig
@@ -28,12 +28,12 @@ const Frame = @import("Frame.zig");
const Session = @import("Session.zig");
fn dispatchInputAndChangeEvents(el: *Element, frame: *Frame) !void {
- const input_evt: *Event = try .initTrusted(comptime .wrap("input"), .{ .bubbles = true }, frame._page);
+ const input_evt: *Event = try .initTrusted(comptime .wrap("input"), .{ .bubbles = true }, frame.page);
frame._event_manager.dispatch(el.asEventTarget(), input_evt) catch |err| {
lp.log.err(.app, "dispatch input event failed", .{ .err = err });
};
- const change_evt: *Event = try .initTrusted(comptime .wrap("change"), .{ .bubbles = true }, frame._page);
+ const change_evt: *Event = try .initTrusted(comptime .wrap("change"), .{ .bubbles = true }, frame.page);
frame._event_manager.dispatch(el.asEventTarget(), change_evt) catch |err| {
lp.log.err(.app, "dispatch change event failed", .{ .err = err });
};
diff --git a/src/browser/frame/observers.zig b/src/browser/frame/observers.zig
index fdc598c79..fe1ff715a 100644
--- a/src/browser/frame/observers.zig
+++ b/src/browser/frame/observers.zig
@@ -100,7 +100,7 @@ pub fn registerMutationObserver(frame: *Frame, observer: *MutationObserver) !voi
}
pub fn unregisterMutationObserver(frame: *Frame, observer: *MutationObserver) void {
- observer.releaseRef(frame._page);
+ observer.releaseRef(frame.page);
frame._mutation.observers.remove(&observer.node);
}
@@ -112,7 +112,7 @@ pub fn registerIntersectionObserver(frame: *Frame, observer: *IntersectionObserv
pub fn unregisterIntersectionObserver(frame: *Frame, observer: *IntersectionObserver) void {
for (frame._intersection.observers.items, 0..) |obs, i| {
if (obs == observer) {
- observer.releaseRef(frame._page);
+ observer.releaseRef(frame.page);
_ = frame._intersection.observers.swapRemove(i);
return;
}
@@ -127,7 +127,7 @@ pub fn registerResizeObserver(frame: *Frame, observer: *ResizeObserver) !void {
pub fn unregisterResizeObserver(frame: *Frame, observer: *ResizeObserver) void {
for (frame._resize.observers.items, 0..) |obs, i| {
if (obs == observer) {
- observer.releaseRef(frame._page);
+ observer.releaseRef(frame.page);
_ = frame._resize.observers.swapRemove(i);
return;
}
@@ -342,8 +342,8 @@ fn disconnectRunawayIntersectionObservers(frame: *Frame) void {
}
for (frame._intersection.observers.items) |observer| {
- observer.reset(frame._page);
- observer.releaseRef(frame._page);
+ observer.reset(frame.page);
+ observer.releaseRef(frame.page);
}
frame._intersection.observers.clearRetainingCapacity();
}
@@ -465,7 +465,7 @@ pub fn deliverMutations(frame: *Frame) void {
// slotchange events fire after the observer callbacks (spec step order)
for (slots) |slot| {
- const event = Event.initTrusted(comptime .wrap("slotchange"), .{ .bubbles = true }, frame._page) catch |err| {
+ const event = Event.initTrusted(comptime .wrap("slotchange"), .{ .bubbles = true }, frame.page) catch |err| {
log.err(.frame, "deliverSlotchange.init", .{ .err = err, .type = frame._type, .url = frame.url });
continue;
};
diff --git a/src/browser/frame/parse.zig b/src/browser/frame/parse.zig
index c14360002..338b85916 100644
--- a/src/browser/frame/parse.zig
+++ b/src/browser/frame/parse.zig
@@ -49,7 +49,7 @@ pub fn fragment(frame: *Frame, node: *Node, html: []const u8, opts: FragmentPars
// The html5ever wrapper-unwrap below rebinds children without going
// through the insertion path, so recompute slot assignments for any
// shadow tree this fragment landed in (idempotent; signals only on diff).
- defer if (frame._element_shadow_roots.count() != 0) {
+ defer if (frame.page.element_shadow_roots.count() != 0) {
const root = node.getRootNode(.{});
if (root.is(ShadowRoot) != null) {
slotting.assignSlottablesForTree(root, frame);
diff --git a/src/browser/frame/user_input.zig b/src/browser/frame/user_input.zig
index 32f53dfaa..e150f3c28 100644
--- a/src/browser/frame/user_input.zig
+++ b/src/browser/frame/user_input.zig
@@ -66,7 +66,7 @@ const HoverContext = struct {
// bubbles up normally, but mouseleave will only fire on parents where the new
// target isn't part of.
pub fn updateHoverTarget(frame: *Frame, to: ?*Element, ctx: HoverContext) void {
- const page = frame._page;
+ const page = frame.page;
const from = page.input_hover_target;
if (from == to) {
return;
@@ -631,7 +631,7 @@ pub fn triggerKeyboard(frame: *Frame, keyboard_event: *KeyboardEvent) !void {
// the keydown still fires and its default action — e.g. sequential focus
// navigation on Tab — can run.
const element = frame.window._document.getActiveElement() orelse {
- event.deinit(frame._page);
+ event.deinit(frame.page);
return;
};
@@ -768,7 +768,7 @@ fn allowEdit(frame: *Frame, keydown: *Event, target: *Element, before_data: ?[]c
.inputType = input_type,
}, frame)).asEvent();
before.acquireRef(); // need to check its _prevent_default
- defer _ = before.releaseRef(frame._page);
+ defer _ = before.releaseRef(frame.page);
try frame._event_manager.dispatch(target.asEventTarget(), before);
if (before._prevent_default) {
return false;
@@ -784,7 +784,7 @@ fn allowEdit(frame: *Frame, keydown: *Event, target: *Element, before_data: ?[]c
.data = data,
}, frame)).asEvent();
text_event.acquireRef(); // need to check its _prevent_default
- defer _ = text_event.releaseRef(frame._page);
+ defer _ = text_event.releaseRef(frame.page);
try frame._event_manager.dispatch(target.asEventTarget(), text_event);
return text_event._prevent_default == false;
}
diff --git a/src/browser/global_scope.zig b/src/browser/global_scope.zig
index 458af8594..6d61b5c16 100644
--- a/src/browser/global_scope.zig
+++ b/src/browser/global_scope.zig
@@ -139,7 +139,7 @@ pub const GlobalScope = union(enum) {
// The Page-level blob: URL store, shared by every global on the page.
pub fn blobUrls(self: GlobalScope) *const Blob.UrlMap {
return switch (self) {
- inline else => |g| &g._page.blob_urls,
+ inline else => |g| &g.page.blob_urls,
};
}
diff --git a/src/browser/js/Env.zig b/src/browser/js/Env.zig
index a3bb9cfbd..38a9c8edd 100644
--- a/src/browser/js/Env.zig
+++ b/src/browser/js/Env.zig
@@ -338,7 +338,7 @@ fn _createContext(self: *Env, global: anytype, params: ContextParams) !*Context
const context_id = self.context_id;
self.context_id = context_id + 1;
- const page = global._page;
+ const page = global.page;
const origin = try page.getOrCreateOrigin(null);
errdefer page.releaseOrigin(origin);
diff --git a/src/browser/links.zig b/src/browser/links.zig
index 7eeaa09e1..e9ef4a39d 100644
--- a/src/browser/links.zig
+++ b/src/browser/links.zig
@@ -65,7 +65,7 @@ pub fn collectLinks(arena: Allocator, root: *Node, frame: *Frame) ![]Link {
var labels: Label.LabelByForIndex = .{};
if (Selector.querySelectorAll(root, "a[href]", frame)) |list| {
- defer list.deinit(frame._page);
+ defer list.deinit(frame.page);
for (list._nodes) |node| {
const anchor = node.is(Element.Html.Anchor) orelse continue;
diff --git a/src/browser/parser/Parser.zig b/src/browser/parser/Parser.zig
index 41d22c6d0..747b569b9 100644
--- a/src/browser/parser/Parser.zig
+++ b/src/browser/parser/Parser.zig
@@ -534,7 +534,8 @@ fn _createElementCallback(self: *Parser, data: *anyopaque, qname: h5e.QualName,
if (namespace == .unknown and namespace_string.len > 0) {
// Same as Document.createElementNS: keep the URI so namespaceURI and
// lookupNamespaceURI can return it.
- try frame._element_namespace_uris.put(frame.arena, node.as(Element), try frame.dupeString(namespace_string));
+ const page = self.document._page;
+ try page.element_namespace_uris.put(page.frame_arena, node.as(Element), try frame.dupeString(namespace_string));
}
const pn = try self.arena.create(ParsedNode);
diff --git a/src/browser/tests/frames/cross_realm_node_state.html b/src/browser/tests/frames/cross_realm_node_state.html
new file mode 100644
index 000000000..63f79d7b0
--- /dev/null
+++ b/src/browser/tests/frames/cross_realm_node_state.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<head></head>
+<body>
+<script src="../testing.js"></script>
+
+<!--
+Lazily-created per-node state (dataset, classList, shadow roots, inline event
+handlers, ...) belongs to the node, whichever realm touches it. The iframe
+helpers run in the iframe's realm, so each pair below reads the same node from
+two realms.
+-->
+<iframe id="idf" src="support/cross_realm_node_state.html"></iframe>
+
+<script id="identity">
+ testing.onload(() => {
+ const idf = document.getElementById('idf');
+ const iwin = idf.contentWindow;
+ const el = idf.contentDocument.getElementById('s1');
+
+ testing.expectTrue(el.dataset === iwin.datasetOf('s1'));
+ testing.expectTrue(el.classList === iwin.classListOf('s1'));
+ });
+</script>
+
+<script id="shadow_root">
+ testing.onload(() => {
+ const idf = document.getElementById('idf');
+ const iwin = idf.contentWindow;
+ const host = idf.contentDocument.getElementById('host');
+
+ const shadow = host.attachShadow({ mode: 'open' });
+ testing.expectTrue(iwin.shadowRootOf('host') === shadow);
+ });
+</script>
+
+<script id="declarative_shadow_root">
+ testing.onload(() => {
+ const idf = document.getElementById('idf');
+ const iwin = idf.contentWindow;
+ const dhost = idf.contentDocument.getElementById('dhost');
+
+ // Attached by the iframe's parser; must be visible to JS from both realms.
+ const shadow = dhost.shadowRoot;
+ testing.expectTrue(shadow !== null);
+ testing.expectTrue(iwin.shadowRootOf('dhost') === shadow);
+ testing.expectEqual('in', shadow.getElementById('inner').textContent);
+ });
+</script>
+
+<script id="inline_handler">
+ testing.onload(() => {
+ const idf = document.getElementById('idf');
+ const iwin = idf.contentWindow;
+ const btn = idf.contentDocument.getElementById('btn');
+
+ let fired = 0;
+ const handler = () => { fired += 1; };
+ btn.onclick = handler;
+ testing.expectTrue(iwin.onclickOf('btn') === handler);
+
+ iwin.clickById('btn');
+ testing.expectEqual(1, fired);
+ });
+</script>
+</body>
diff --git a/src/browser/tests/frames/support/cross_realm_node_state.html b/src/browser/tests/frames/support/cross_realm_node_state.html
new file mode 100644
index 000000000..829ec8802
--- /dev/null
+++ b/src/browser/tests/frames/support/cross_realm_node_state.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<head></head>
+<body>
+ <span id="s1" data-cp="5F" class="a b">x</span>
+ <div id="host"></div>
+ <div id="dhost"><template shadowrootmode="open"><p id="inner">in</p></template></div>
+ <button id="btn">b</button>
+ <script>
+ // Called by the parent test: these execute in this frame's realm.
+ function datasetOf(id) {
+ return document.getElementById(id).dataset;
+ }
+ function classListOf(id) {
+ return document.getElementById(id).classList;
+ }
+ function shadowRootOf(id) {
+ return document.getElementById(id).shadowRoot;
+ }
+ function onclickOf(id) {
+ return document.getElementById(id).onclick;
+ }
+ function clickById(id) {
+ document.getElementById(id).click();
+ }
+ </script>
+</body>
diff --git a/src/browser/tools.zig b/src/browser/tools.zig
index d22868708..68d7d131b 100644
--- a/src/browser/tools.zig
+++ b/src/browser/tools.zig
@@ -1368,7 +1368,7 @@ fn execScreenshot(arena: std.mem.Allocator, session: *lp.Session, registry: *Nod
const page = try ensurePage(session, registry, args.url, args.timeout);
const scope = try resolveScope(session, registry, page, args.selector, args.backendNodeId);
const state = lp.RenderTree.resolve(arena, scope, args.strip, page) catch return ToolError.OutOfMemory;
- const opts: lp.screenshot.Opts = .fromViewport(page._page.getViewport(), args.fullPage);
+ const opts: lp.screenshot.Opts = .fromViewport(page.page.getViewport(), args.fullPage);
var prepared = lp.screenshot.preparePng(arena, state, opts, page) catch
return ToolError.InternalError;
@@ -1767,7 +1767,7 @@ fn awaitQueuedNavigation(session: *lp.Session, frame: *lp.Frame) ToolError!void
// Runner waits are keyed by Page root (a popup lives on its opener's
// Page). Read it before processing: a synthetic root navigation frees
// the Page in place.
- const root_frame_id = frame._page.frame._frame_id;
+ const root_frame_id = frame.page.frame._frame_id;
const navigated = session.processQueuedNavigation() catch return ToolError.InternalError;
if (navigated == false) {
return;
@@ -1794,7 +1794,7 @@ const ActionScope = struct {
fn beginAction(session: *lp.Session) ActionScope {
const frame = session.currentFrame();
- return .{ .frame = frame, .popups = if (frame) |f| f._page.popups.items.len else 0 };
+ return .{ .frame = frame, .popups = if (frame) |f| f.page.popups.items.len else 0 };
}
/// Finish a state-changing action: drain any queued navigation triggered by
@@ -1813,14 +1813,14 @@ fn finalizeAction(arena: std.mem.Allocator, session: *lp.Session, registry: *Nod
if (before != null and before.? != page) registry.reset();
var note: []const u8 = "";
- if (page._page.popups.items.len > scope.popups) {
+ if (page.page.popups.items.len > scope.popups) {
// The action opened a new window (target=_blank or window.open).
// Follow it, as a user whose click opened a tab would.
var runner = session.runner(.{});
- runner.waitForFrame(page._page.frame._frame_id, 10000, .{ .until = .done }) catch |err|
+ runner.waitForFrame(page.page.frame._frame_id, 10000, .{ .until = .done }) catch |err|
return if (err == error.Cancelled) ToolError.Cancelled else ToolError.NavigationFailed;
page = try requireFrame(session);
- const popups = page._page.popups.items;
+ const popups = page.page.popups.items;
if (popups.len > scope.popups) {
page = popups[popups.len - 1];
session.followPopup(page._frame_id);
diff --git a/src/browser/webapi/Blob.zig b/src/browser/webapi/Blob.zig
index f6ac4711d..ccd2c81bc 100644
--- a/src/browser/webapi/Blob.zig
+++ b/src/browser/webapi/Blob.zig
@@ -447,8 +447,8 @@ test "Blob: a pinned arena reaches the browser's account and is given back" {
const frame = try testing.createFrame();
defer testing.test_session.closeAllPages();
- const page = frame._page;
- const browser = frame._session.browser;
+ const page = frame.page;
+ const browser = page.session.browser;
browser.flushArenaMemory();
try testing.expectEqual(0, browser.arena_account.pending);
diff --git a/src/browser/webapi/CSS.zig b/src/browser/webapi/CSS.zig
index 2e475db77..213064d7b 100644
--- a/src/browser/webapi/CSS.zig
+++ b/src/browser/webapi/CSS.zig
@@ -33,8 +33,8 @@ pub fn parseDimensionViewport(value: []const u8, frame: *Frame) ?f64 {
const parsed = units.parse(value) catch return null;
return switch (parsed.unit) {
.none, .px => parsed.value,
- .vh => parsed.value * @as(f64, @floatFromInt(frame._page.getViewport().height)) / 100.0,
- .vw => parsed.value * @as(f64, @floatFromInt(frame._page.getViewport().width)) / 100.0,
+ .vh => parsed.value * @as(f64, @floatFromInt(frame.page.getViewport().height)) / 100.0,
+ .vw => parsed.value * @as(f64, @floatFromInt(frame.page.getViewport().width)) / 100.0,
else => null,
};
}
diff --git a/src/browser/webapi/DOMImplementation.zig b/src/browser/webapi/DOMImplementation.zig
index f489f62c6..9e9c5c311 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 frame._element_namespace_uris.put(frame.arena, root.as(Node.Element), duped);
+ try document._page.element_namespace_uris.put(document._page.frame_arena, root.as(Node.Element), duped);
}
}
diff --git a/src/browser/webapi/DOMParser.zig b/src/browser/webapi/DOMParser.zig
index d75d81429..f3f02fa0a 100644
--- a/src/browser/webapi/DOMParser.zig
+++ b/src/browser/webapi/DOMParser.zig
@@ -108,7 +108,8 @@ const parsererror_ns = "http://www.mozilla.org/newlayout/xml/parsererror.xml";
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);
- try frame._element_namespace_uris.put(frame.arena, root.as(Node.Element), parsererror_ns);
+ const page = doc.asDocument()._page;
+ try page.element_namespace_uris.put(page.frame_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.zig
index b5fc689fb..39c2a34f5 100644
--- a/src/browser/webapi/DataTransfer.zig
+++ b/src/browser/webapi/DataTransfer.zig
@@ -181,7 +181,7 @@ pub fn removeItem(self: *DataTransfer, index: u32, frame: *Frame) !void {
}
const it = self._items.orderedRemove(index);
if (it._kind == .file) {
- it._payload.file._proto.releaseRef(frame._page);
+ it._payload.file._proto.releaseRef(frame.page);
try self.rebuildFiles(frame);
}
}
@@ -189,7 +189,7 @@ pub fn removeItem(self: *DataTransfer, index: u32, frame: *Frame) !void {
pub fn clearItems(self: *DataTransfer, frame: *Frame) !void {
for (self._items.items) |it| {
if (it._kind == .file) {
- it._payload.file._proto.releaseRef(frame._page);
+ it._payload.file._proto.releaseRef(frame.page);
}
}
self._items.clearRetainingCapacity();
diff --git a/src/browser/webapi/DedicatedWorkerGlobalScope.zig b/src/browser/webapi/DedicatedWorkerGlobalScope.zig
index 50b06b03e..c333d6c38 100644
--- a/src/browser/webapi/DedicatedWorkerGlobalScope.zig
+++ b/src/browser/webapi/DedicatedWorkerGlobalScope.zig
@@ -213,7 +213,7 @@ const ReceiveMessageCallback = struct {
const event = (try MessageEvent.initTrusted(comptime .wrap("messageerror"), .{
.bubbles = false,
.cancelable = false,
- }, wsg._page)).asEvent();
+ }, wsg.page)).asEvent();
try wsg.dispatch(target, event, on_messageerror, .{});
return null;
}
@@ -230,7 +230,7 @@ const ReceiveMessageCallback = struct {
.data = .{ .value = self.data.? },
.bubbles = false,
.cancelable = false,
- }, wsg._page)).asEvent();
+ }, wsg.page)).asEvent();
try wsg.dispatch(target, event, on_message, .{});
return null;
}
diff --git a/src/browser/webapi/Document.zig b/src/browser/webapi/Document.zig
index d3ceadc96..c9ba54688 100644
--- a/src/browser/webapi/Document.zig
+++ b/src/browser/webapi/Document.zig
@@ -398,7 +398,7 @@ pub fn createElementNS(self: *Document, namespace: ?[]const u8, name: []const u8
if (ns == .unknown) {
if (namespace) |uri| {
const duped = try frame.dupeString(uri);
- try frame._element_namespace_uris.put(frame.arena, node.as(Element), duped);
+ try self._page.element_namespace_uris.put(self._page.frame_arena, node.as(Element), duped);
}
}
return node.as(Element);
@@ -547,12 +547,12 @@ fn createEvent(_: *const Document, event_type: []const u8, frame: *Frame) !*@imp
const event: *Event = blk: {
if (std.mem.eql(u8, normalized, "event") or std.mem.eql(u8, normalized, "events") or std.mem.eql(u8, normalized, "htmlevents") or std.mem.eql(u8, normalized, "svgevents")) {
- break :blk try Event.init("", null, frame._page);
+ break :blk try Event.init("", null, frame.page);
}
if (std.mem.eql(u8, normalized, "customevent")) {
const CustomEvent = @import("event/CustomEvent.zig");
- break :blk (try CustomEvent.init("", null, frame._page)).asEvent();
+ break :blk (try CustomEvent.init("", null, frame.page)).asEvent();
}
if (std.mem.eql(u8, normalized, "keyboardevent")) {
@@ -577,7 +577,7 @@ fn createEvent(_: *const Document, event_type: []const u8, frame: *Frame) !*@imp
if (std.mem.eql(u8, normalized, "messageevent")) {
const MessageEvent = @import("event/MessageEvent.zig");
- break :blk (try MessageEvent.init("", null, frame._page)).asEvent();
+ break :blk (try MessageEvent.init("", null, frame.page)).asEvent();
}
if (std.mem.eql(u8, normalized, "hashchangeevent")) {
diff --git a/src/browser/webapi/Element.zig b/src/browser/webapi/Element.zig
index edbf475b2..5c228d546 100644
--- a/src/browser/webapi/Element.zig
+++ b/src/browser/webapi/Element.zig
@@ -443,7 +443,7 @@ pub fn getNamespaceURI(self: *const Element) ?[]const u8 {
pub fn getNamespaceUri(self: *Element, frame: *Frame) ?[]const u8 {
if (self._namespace != .unknown) return self._namespace.toUri();
- return frame._element_namespace_uris.get(self);
+ return frame.page.element_namespace_uris.get(self);
}
pub fn lookupNamespaceURIForElement(self: *Element, prefix: ?[]const u8, frame: *Frame) ?[]const u8 {
@@ -900,7 +900,8 @@ pub fn attachShadow(self: *Element, opts: ShadowRoot.AttachOptions, frame: *Fram
}
const shadow_root = try ShadowRoot.init(self, opts, frame);
- try frame._element_shadow_roots.put(frame.arena, self, shadow_root);
+ const page = frame.page;
+ try page.element_shadow_roots.put(page.frame_arena, self, shadow_root);
self._flags.shadow_host = true;
return shadow_root;
}
@@ -912,7 +913,7 @@ pub fn hostedShadowRoot(self: *Element, frame: *const Frame) ?*ShadowRoot {
if (!self._flags.shadow_host) {
return null;
}
- return frame._element_shadow_roots.get(self);
+ return frame.page.element_shadow_roots.get(self);
}
pub fn insertAdjacentElement(
@@ -995,19 +996,20 @@ pub fn getAttributeNames(self: *const Element, frame: *Frame) ![][]const u8 {
}
pub fn getAttributeNamedNodeMap(self: *Element, frame: *Frame) !*Attribute.NamedNodeMap {
- const gop = try frame._attribute_named_node_map_lookup.getOrPut(frame.arena, @intFromPtr(self));
+ const page = frame.page;
+ const gop = try page.attribute_named_node_map_lookup.getOrPut(page.frame_arena, @intFromPtr(self));
if (!gop.found_existing) {
gop.value_ptr.* = try frame._factory.create(Attribute.NamedNodeMap{ ._element = self });
}
return gop.value_ptr.*;
}
-// The materialized style lives in the map of the element's own frame, not
-// the caller's: attributeChange (which resyncs it) is dispatched on the owner
-// frame, and a same-origin script can reach an element in another frame.
+// The materialized style is built with the element's own frame, not the
+// caller's: a same-origin script can reach an element in another frame.
pub fn getOrCreateStyle(self: *Element, frame: *Frame) !*CSSStyleProperties {
const owner = self.ownerFrame(frame) orelse frame;
- const gop = try owner._element_styles.getOrPut(owner.arena, self);
+ const page = frame.page;
+ const gop = try page.element_styles.getOrPut(page.frame_arena, self);
if (!gop.found_existing) {
gop.value_ptr.* = try CSSStyleProperties.init(self, false, owner);
}
@@ -1019,7 +1021,7 @@ pub fn existingStyle(self: *Element, frame: *Frame) ?*CSSStyleProperties {
if (!self._flags.has_inline_style) {
return null;
}
- return (self.ownerFrame(frame) orelse frame)._element_styles.get(self);
+ return frame.page.element_styles.get(self);
}
/// The inline style object, parsed from the style attribute on first use;
@@ -1055,7 +1057,8 @@ pub fn setStyle(self: *Element, value: []const u8, frame: *Frame) !void {
}
pub fn getClassList(self: *Element, frame: *Frame) !*collections.DOMTokenList {
- const gop = try frame._element_class_lists.getOrPut(frame.arena, self);
+ const page = frame.page;
+ const gop = try page.element_class_lists.getOrPut(page.frame_arena, self);
if (!gop.found_existing) {
gop.value_ptr.* = try frame._factory.create(collections.DOMTokenList{
._element = self,
@@ -1071,7 +1074,8 @@ pub fn setClassList(self: *Element, value: String, frame: *Frame) !void {
}
pub fn getPartList(self: *Element, frame: *Frame) !*collections.DOMTokenList {
- const gop = try frame._element_part_lists.getOrPut(frame.arena, self);
+ const page = frame.page;
+ const gop = try page.element_part_lists.getOrPut(page.frame_arena, self);
if (!gop.found_existing) {
gop.value_ptr.* = try frame._factory.create(collections.DOMTokenList{
._element = self,
@@ -1082,7 +1086,8 @@ pub fn getPartList(self: *Element, frame: *Frame) !*collections.DOMTokenList {
}
pub fn getRelList(self: *Element, frame: *Frame) !*collections.DOMTokenList {
- const gop = try frame._element_rel_lists.getOrPut(frame.arena, self);
+ const page = frame.page;
+ const gop = try page.element_rel_lists.getOrPut(page.frame_arena, self);
if (!gop.found_existing) {
gop.value_ptr.* = try frame._factory.create(collections.DOMTokenList{
._element = self,
@@ -1099,7 +1104,8 @@ pub const TokenListKey = struct { element: *Element, attribute: TokenListAttribu
pub const TokenListLookup = std.AutoHashMapUnmanaged(TokenListKey, *collections.DOMTokenList);
pub fn getTokenList(self: *Element, comptime attribute: TokenListAttribute, frame: *Frame) !*collections.DOMTokenList {
- const gop = try frame._element_token_lists.getOrPut(frame.arena, .{ .element = self, .attribute = attribute });
+ const page = frame.page;
+ const gop = try page.element_token_lists.getOrPut(page.frame_arena, .{ .element = self, .attribute = attribute });
if (!gop.found_existing) {
gop.value_ptr.* = try frame._factory.create(collections.DOMTokenList{
._element = self,
@@ -1110,7 +1116,8 @@ pub fn getTokenList(self: *Element, comptime attribute: TokenListAttribute, fram
}
pub fn getDataset(self: *Element, frame: *Frame) !*DOMStringMap {
- const gop = try frame._element_datasets.getOrPut(frame.arena, self);
+ const page = frame.page;
+ const gop = try page.element_datasets.getOrPut(page.frame_arena, self);
if (!gop.found_existing) {
gop.value_ptr.* = try frame._factory.create(DOMStringMap{
._element = self,
@@ -1504,7 +1511,7 @@ fn viewportAxis(self: *Element, frame: *Frame, comptime axis: Axis) ?f64 {
// clientWidth and clientHeight rather than its own MASSIVE box. This
// fixes jstracker's uiContourMap which attempts to tile the clientHeight
// of the body. (https://github.com/lightpanda-io/browser/issues/3251)
- const viewport = frame._page.getViewport();
+ const viewport = frame.page.getViewport();
return @floatFromInt(if (axis == .width) viewport.width else viewport.height);
}
@@ -1558,20 +1565,19 @@ pub fn getClientRects(self: *Element, frame: *Frame) ![]*DOMRect {
return rects;
}
-// Scroll positions live in the map of the element's own frame — not the
-// caller's, which differs when a same-origin script scrolls an element in
-// another frame (e.g. inside an iframe). All scroll accessors resolve the
-// owner frame first so the state, the fired events and the document
-// comparison stay in the element's frame.
+// Scroll events fire in the element's own frame — not the caller's, which
+// differs when a same-origin script scrolls an element in another frame (e.g.
+// inside an iframe). All scroll accessors resolve the owner frame first so the
+// fired events and the document comparison stay in the element's frame.
pub fn getScrollTop(self: *Element, frame: *Frame) u32 {
const owner = self.ownerFrame(frame) orelse return 0;
- const pos = owner._element_scroll_positions.get(self) orelse return 0;
+ const pos = owner.page.element_scroll_positions.get(self) orelse return 0;
return pos.y;
}
pub fn setScrollTop(self: *Element, value: i32, frame: *Frame) !void {
const owner = self.ownerFrame(frame) orelse return;
- const gop = try owner._element_scroll_positions.getOrPut(owner.arena, self);
+ const gop = try owner.page.element_scroll_positions.getOrPut(owner.page.frame_arena, self);
if (!gop.found_existing) {
gop.value_ptr.* = .{};
}
@@ -1584,13 +1590,13 @@ pub fn setScrollTop(self: *Element, value: i32, frame: *Frame) !void {
pub fn getScrollLeft(self: *Element, frame: *Frame) u32 {
const owner = self.ownerFrame(frame) orelse return 0;
- const pos = owner._element_scroll_positions.get(self) orelse return 0;
+ const pos = owner.page.element_scroll_positions.get(self) orelse return 0;
return pos.x;
}
pub fn setScrollLeft(self: *Element, value: i32, frame: *Frame) !void {
const owner = self.ownerFrame(frame) orelse return;
- const gop = try owner._element_scroll_positions.getOrPut(owner.arena, self);
+ const gop = try owner.page.element_scroll_positions.getOrPut(owner.page.frame_arena, self);
if (!gop.found_existing) {
gop.value_ptr.* = .{};
}
@@ -1919,8 +1925,9 @@ pub fn clone(self: *Element, deep: bool, document: *const Node.Document, frame:
// A namespace outside the built-in set lives in a side table; the clone
// must report the same namespaceURI.
if (self._namespace == .unknown) {
- if (frame._element_namespace_uris.get(self)) |uri| {
- try frame._element_namespace_uris.put(frame.arena, node.as(Element), uri);
+ 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);
}
}
@@ -2015,7 +2022,7 @@ pub const ScrollToOpts = union(enum) {
pub fn scrollTo(self: *Element, opts: ?ScrollToOpts, y: ?i32, frame: *Frame) !void {
const o = (opts orelse return).offsets(y);
const owner = self.ownerFrame(frame) orelse return;
- const gop = try owner._element_scroll_positions.getOrPut(owner.arena, self);
+ const gop = try owner.page.element_scroll_positions.getOrPut(owner.page.frame_arena, self);
if (!gop.found_existing) {
gop.value_ptr.* = .{};
}
@@ -2032,7 +2039,7 @@ pub fn scrollTo(self: *Element, opts: ?ScrollToOpts, y: ?i32, frame: *Frame) !vo
pub fn scrollBy(self: *Element, opts: ?ScrollToOpts, y: ?i32, frame: *Frame) !void {
const o = (opts orelse return).offsets(y);
const owner = self.ownerFrame(frame) orelse return;
- const gop = try owner._element_scroll_positions.getOrPut(owner.arena, self);
+ const gop = try owner.page.element_scroll_positions.getOrPut(owner.page.frame_arena, self);
if (!gop.found_existing) {
gop.value_ptr.* = .{};
}
@@ -2050,7 +2057,7 @@ pub fn scrollBy(self: *Element, opts: ?ScrollToOpts, y: ?i32, frame: *Frame) !vo
// scrolling element (the root) are fired at the document instead.
// `frame` is the element's owner frame (resolved by the public accessors).
fn scheduleScrollEvents(self: *Element, frame: *Frame) !void {
- const gop = try frame._element_scroll_positions.getOrPut(frame.arena, self);
+ const gop = try frame.page.element_scroll_positions.getOrPut(frame.page.frame_arena, self);
if (!gop.found_existing) {
gop.value_ptr.* = .{};
}
@@ -2091,7 +2098,7 @@ const ScrollEventTask = struct {
fn cancelled(ptr: *anyopaque) void {
const self: *ScrollEventTask = @ptrCast(@alignCast(ptr));
- if (self.frame._element_scroll_positions.getPtr(self.element)) |pos| {
+ if (self.frame.page.element_scroll_positions.getPtr(self.element)) |pos| {
pos.state = .done;
}
self.frame._factory.destroy(self);
@@ -2100,7 +2107,7 @@ const ScrollEventTask = struct {
fn run(ptr: *anyopaque) anyerror!?u32 {
const self: *ScrollEventTask = @ptrCast(@alignCast(ptr));
const f = self.frame;
- const pos = f._element_scroll_positions.getPtr(self.element) orelse {
+ const pos = f.page.element_scroll_positions.getPtr(self.element) orelse {
f._factory.destroy(self);
return null;
};
@@ -2125,7 +2132,7 @@ const ScrollEventTask = struct {
fn dispatchEvent(self: *ScrollEventTask, comptime event_type: String) void {
const Event = @import("Event.zig");
- const event = Event.initTrusted(event_type, .{ .bubbles = self.bubbles() }, self.frame._page) catch |err| {
+ const event = Event.initTrusted(event_type, .{ .bubbles = self.bubbles() }, self.frame.page) catch |err| {
log.warn(.dom, "element.scroll.event", .{ .err = err });
return;
};
diff --git a/src/browser/webapi/EventTarget.zig b/src/browser/webapi/EventTarget.zig
index a4ecce7a7..a33b38376 100644
--- a/src/browser/webapi/EventTarget.zig
+++ b/src/browser/webapi/EventTarget.zig
@@ -179,7 +179,7 @@ pub fn dispatchEvent(self: *EventTarget, event: *Event, exec: *js.Execution) !bo
switch (exec.js.global) {
.frame => |frame| {
event.acquireRef();
- defer _ = event.releaseRef(frame._page);
+ defer _ = event.releaseRef(frame.page);
try frame._event_manager.dispatch(self, event);
},
.worker => |wgs| try wgs.dispatch(self, event, null, .{}),
diff --git a/src/browser/webapi/IntersectionObserver.zig b/src/browser/webapi/IntersectionObserver.zig
index d84bff9dc..169ff0dfd 100644
--- a/src/browser/webapi/IntersectionObserver.zig
+++ b/src/browser/webapi/IntersectionObserver.zig
@@ -154,7 +154,7 @@ fn unobserve(self: *IntersectionObserver, target: *Element, frame: *Frame) void
while (j < self._pending_entries.items.len) {
if (self._pending_entries.items[j]._target == target) {
const entry = self._pending_entries.swapRemove(j);
- entry.releaseRef(frame._page);
+ entry.releaseRef(frame.page);
} else {
j += 1;
}
@@ -178,7 +178,7 @@ pub fn reset(self: *IntersectionObserver, page: *Page) void {
pub fn disconnect(self: *IntersectionObserver, frame: *Frame) void {
const registered = self._observing.items.len > 0;
- self.reset(frame._page);
+ self.reset(frame.page);
if (registered) {
Frame.observers.unregisterIntersectionObserver(frame, self);
}
@@ -188,7 +188,7 @@ fn takeRecords(self: *IntersectionObserver, frame: *Frame) !js.Value {
const local = frame.js.local orelse return error.NotHandled;
const entries = try self.takePendingEntries(frame);
// whether we safely deliver these to v8 or not, we're done with these
- defer releaseAll(entries, frame._page);
+ defer releaseAll(entries, frame.page);
return local.zigValueToJs(entries, .{});
}
@@ -216,7 +216,7 @@ fn calculateIntersection(
const root_rect = if (self._root) |root|
root.boundingClientRectValues(frame)
else blk: {
- const viewport = frame._page.getViewport();
+ const viewport = frame.page.getViewport();
break :blk DOMRect.Data{
.width = @floatFromInt(viewport.width),
.height = @floatFromInt(viewport.height),
@@ -317,7 +317,7 @@ pub fn deliverEntries(self: *IntersectionObserver, frame: *Frame) !void {
const entries = try self.takePendingEntries(frame);
// whether we safely deliver these to v8 or not, we're done with these
- defer releaseAll(entries, frame._page);
+ defer releaseAll(entries, frame.page);
var caught: js.TryCatch.Caught = .{};
diff --git a/src/browser/webapi/Location.zig b/src/browser/webapi/Location.zig
index bb191ea12..488e19ca7 100644
--- a/src/browser/webapi/Location.zig
+++ b/src/browser/webapi/Location.zig
@@ -33,7 +33,7 @@ _rc: lp.RC = .{},
pub fn init(raw_url: []const u8, frame: *Frame) !*Location {
const url = try URL.init(raw_url, null, &frame.js.execution);
url.acquireRef();
- errdefer url.releaseRef(frame._page);
+ errdefer url.releaseRef(frame.page);
return frame._factory.create(Location{
._url = url,
diff --git a/src/browser/webapi/MutationObserver.zig b/src/browser/webapi/MutationObserver.zig
index a6a771ff0..ccc690718 100644
--- a/src/browser/webapi/MutationObserver.zig
+++ b/src/browser/webapi/MutationObserver.zig
@@ -171,7 +171,7 @@ pub fn observe(self: *MutationObserver, target: *Node, options: ObserveOptions,
}
pub fn disconnect(self: *MutationObserver, frame: *Frame) void {
- releaseAll(self._pending_records.items, frame._page);
+ releaseAll(self._pending_records.items, frame.page);
self._pending_records.clearRetainingCapacity();
if (self._observing.items.len > 0) {
@@ -184,7 +184,7 @@ fn takeRecords(self: *MutationObserver, frame: *Frame) !js.Value {
const local = frame.js.local orelse return error.NotHandled;
const records = try self.takePendingRecords(frame);
// whether we safely deliver these to v8 or not, we're done with these
- defer releaseAll(records, frame._page);
+ defer releaseAll(records, frame.page);
return local.zigValueToJs(records, .{});
}
@@ -356,7 +356,7 @@ pub fn deliverRecords(self: *MutationObserver, frame: *Frame) !void {
// This ensures mutations triggered during the callback go into a fresh list
const records = try self.takePendingRecords(frame);
// whether we safely deliver these to v8 or not, we're done with these
- defer releaseAll(records, frame._page);
+ defer releaseAll(records, frame.page);
var ls: js.Local.Scope = undefined;
frame.js.localScope(&ls);
diff --git a/src/browser/webapi/Node.zig b/src/browser/webapi/Node.zig
index 2bf956a60..0b9e4c72e 100644
--- a/src/browser/webapi/Node.zig
+++ b/src/browser/webapi/Node.zig
@@ -1677,7 +1677,7 @@ pub fn assignedSlot(self: *Node, frame: *const Frame) ?*Element.Html.Slot {
if (!self._flags.assigned_slot) {
return null;
}
- return frame._assigned_slots.get(self);
+ return frame.page._assigned_slots.get(self);
}
pub const JsApi = struct {
diff --git a/src/browser/webapi/Screen.zig b/src/browser/webapi/Screen.zig
index 9bd8226ad..4a9dddb06 100644
--- a/src/browser/webapi/Screen.zig
+++ b/src/browser/webapi/Screen.zig
@@ -48,12 +48,12 @@ fn getOrientation(self: *Screen, frame: *Frame) !*Orientation {
}
pub fn getWidth(_: *const Screen, frame: *Frame) u32 {
- const viewport = frame._page.getViewport();
+ const viewport = frame.page.getViewport();
return viewport.screen_width orelse viewport.width;
}
pub fn getHeight(_: *const Screen, frame: *Frame) u32 {
- const viewport = frame._page.getViewport();
+ const viewport = frame.page.getViewport();
return viewport.screen_height orelse viewport.height;
}
diff --git a/src/browser/webapi/Selection.zig b/src/browser/webapi/Selection.zig
index 1d1871481..41cb692bf 100644
--- a/src/browser/webapi/Selection.zig
+++ b/src/browser/webapi/Selection.zig
@@ -55,7 +55,7 @@ pub fn acquireRef(self: *Selection) void {
}
fn dispatchSelectionChangeEvent(frame: *Frame) !void {
- const event = try Event.init("selectionchange", .{}, frame._page);
+ const event = try Event.init("selectionchange", .{}, frame.page);
try frame._event_manager.dispatch(frame.document.asEventTarget(), event);
}
@@ -719,7 +719,7 @@ pub fn toString(self: *const Selection, frame: *Frame) ![]const u8 {
fn setRange(self: *Selection, new_range: ?*Range, frame: *Frame) void {
if (self._range) |existing| {
- _ = existing.asAbstractRange().releaseRef(frame._page);
+ _ = existing.asAbstractRange().releaseRef(frame.page);
}
if (new_range) |nr| {
nr.asAbstractRange().acquireRef();
diff --git a/src/browser/webapi/SharedWorker.zig b/src/browser/webapi/SharedWorker.zig
index e208f2040..62e481c8d 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) !*Shar
const s = try SharedWorkerGlobalScope.init(frame, resolved_url, options.name, options.type);
errdefer s.deinit();
- const page = frame._page;
+ const page = frame.page;
try page.shared_workers.append(page.frame_arena, s);
errdefer _ = page.shared_workers.pop();
@@ -87,7 +87,7 @@ pub fn init(url: []const u8, name_or_options: ?NameOrOpts, frame: *Frame) !*Shar
};
const port = try scope.connect(&frame.js.execution);
- return frame._page.factory.eventTarget(SharedWorker{
+ return frame.page.factory.eventTarget(SharedWorker{
._proto = undefined,
._port = port,
});
diff --git a/src/browser/webapi/SharedWorkerGlobalScope.zig b/src/browser/webapi/SharedWorkerGlobalScope.zig
index f9c02c765..74fde3df8 100644
--- a/src/browser/webapi/SharedWorkerGlobalScope.zig
+++ b/src/browser/webapi/SharedWorkerGlobalScope.zig
@@ -387,7 +387,7 @@ const ConnectCallback = struct {
.ports = &.{self.port},
.bubbles = false,
.cancelable = false,
- }, wgs._page)).asEvent();
+ }, wgs.page)).asEvent();
try wgs.dispatch(target, event, on_connect, .{ .context = "SharedWorkerGlobalScope.connect" });
return null;
diff --git a/src/browser/webapi/VisualViewport.zig b/src/browser/webapi/VisualViewport.zig
index 7086622cb..0dc32c1ef 100644
--- a/src/browser/webapi/VisualViewport.zig
+++ b/src/browser/webapi/VisualViewport.zig
@@ -39,11 +39,11 @@ fn getPageTop(_: *const VisualViewport, frame: *Frame) u32 {
}
pub fn getWidth(_: *const VisualViewport, frame: *Frame) u32 {
- return frame._page.getViewport().width;
+ return frame.page.getViewport().width;
}
pub fn getHeight(_: *const VisualViewport, frame: *Frame) u32 {
- return frame._page.getViewport().height;
+ return frame.page.getViewport().height;
}
pub const JsApi = struct {
diff --git a/src/browser/webapi/WebDriver.zig b/src/browser/webapi/WebDriver.zig
index df5008ca3..bbd850573 100644
--- a/src/browser/webapi/WebDriver.zig
+++ b/src/browser/webapi/WebDriver.zig
@@ -273,7 +273,7 @@ fn performPointerSource(source: js.Object, frame: *Frame) !void {
} else {
Frame.user_input.updateHoverTarget(frame, el, .{
.buttons = pressed_mask,
- .modifiers = frame._page.input_modifiers,
+ .modifiers = frame.page.input_modifiers,
.with_pointer = true,
});
dispatchPointer(el, "pointermove", 0, pressed_mask, frame);
@@ -421,7 +421,7 @@ fn performKeySource(source: js.Object, frame: *Frame) !void {
// A modifier's own keydown already carries its flag; its keyup no
// longer does.
- setModifier(&frame._page.input_modifiers, key, is_down);
+ setModifier(&frame.page.input_modifiers, key, is_down);
// Key actions have no explicit target; they go to the focused element,
// or the document if nothing is focused. Resolved per action since a
@@ -517,7 +517,7 @@ fn setModifier(modifiers: *Modifiers, key: []const u8, pressed: bool) void {
}
fn dispatchKey(target: *EventTarget, typ: lp.String, key: []const u8, frame: *Frame) void {
- const modifiers = frame._page.input_modifiers;
+ const modifiers = frame.page.input_modifiers;
const event = KeyboardEvent.initTrusted(typ, .{
.bubbles = true,
.cancelable = true,
@@ -543,7 +543,7 @@ fn readI32(obj: js.Object, key: []const u8, default: i32) i32 {
}
fn dispatchPointer(el: *Element, comptime typ: []const u8, button: i32, buttons: u16, frame: *Frame) void {
- const modifiers = frame._page.input_modifiers;
+ const modifiers = frame.page.input_modifiers;
const event = PointerEvent.initTrusted(typ, .{
.bubbles = true,
.cancelable = true,
@@ -565,7 +565,7 @@ fn dispatchPointer(el: *Element, comptime typ: []const u8, button: i32, buttons:
}
fn dispatchMouse(el: *Element, comptime typ: []const u8, button: i32, buttons: u16, detail: u32, frame: *Frame) bool {
- const modifiers = frame._page.input_modifiers;
+ const modifiers = frame.page.input_modifiers;
const event = MouseEvent.initTrusted(comptime .wrap(typ), .{
.bubbles = true,
.cancelable = true,
@@ -604,7 +604,7 @@ fn dispatchWheel(el: *Element, delta_x: i32, delta_y: i32, frame: *Frame) void {
// Keep the event alive past dispatch so we can read _prevent_default.
event.asEvent().acquireRef();
- defer _ = event.asEvent().releaseRef(frame._page);
+ defer _ = event.asEvent().releaseRef(frame.page);
dispatch(el.asEventTarget(), event.asEvent(), frame, "wheel");
// Blink also fires the legacy mousewheel event.
@@ -619,7 +619,7 @@ fn dispatchWheel(el: *Element, delta_x: i32, delta_y: i32, frame: *Frame) void {
return;
};
legacy.asEvent().acquireRef();
- defer _ = legacy.asEvent().releaseRef(frame._page);
+ defer _ = legacy.asEvent().releaseRef(frame.page);
dispatch(el.asEventTarget(), legacy.asEvent(), frame, "mousewheel");
if (event.asEvent()._prevent_default or legacy.asEvent()._prevent_default) {
diff --git a/src/browser/webapi/Window.zig b/src/browser/webapi/Window.zig
index 1c5f389ae..f4f8a7838 100644
--- a/src/browser/webapi/Window.zig
+++ b/src/browser/webapi/Window.zig
@@ -580,7 +580,7 @@ pub fn reportError(self: *Window, err: js.Value, frame: *Frame) !void {
return;
}
- frame._page.recordJsError(error.JsException);
+ frame.page.recordJsError(error.JsException);
const target = self.asEventTarget();
if (!frame._event_manager.hasDirectListeners(target, "error", self._on_error)) {
@@ -600,7 +600,7 @@ pub fn reportError(self: *Window, err: js.Value, frame: *Frame) !void {
.message = err.toStringSlice() catch "Unknown error",
.bubbles = false,
.cancelable = true,
- }, frame._page);
+ }, frame.page);
// Invoke window.onerror callback if set (per WHATWG spec, this is called
// with 5 arguments: message, source, lineno, colno, error)
@@ -628,7 +628,7 @@ pub fn reportError(self: *Window, err: js.Value, frame: *Frame) !void {
const event = error_event.asEvent();
event.acquireRef();
- defer event.releaseRef(frame._page);
+ defer event.releaseRef(frame.page);
event._prevent_default = prevent_default;
// Pass null as handler: onerror was already called above with 5 args.
@@ -659,7 +659,8 @@ fn getComputedStyle(_: *const Window, element: *Element, pseudo_element: ?[]cons
// (the element's own computed style) is a reasonable default for the
// common probes
const pseudo = Element.PseudoElement.parse(pseudo_element orelse "");
- const gop = try frame._element_computed_styles.getOrPut(frame.arena, .{ .element = element, .pseudo = pseudo });
+ const page = frame.page;
+ const gop = try page.element_computed_styles.getOrPut(page.frame_arena, .{ .element = element, .pseudo = pseudo });
if (!gop.found_existing) {
if (pseudo == .other) {
log.warn(.not_implemented, "window.GetComputedStyle", .{ .pseudo_element = pseudo_element.? });
@@ -714,7 +715,7 @@ pub fn open(self: *Window, url_: ?[]const u8, target_: ?[]const u8, features_: ?
return Access.init(frame.window, nav_target.window);
}
- const page = frame._page;
+ const page = frame.page;
// Name-based reuse: if a popup with this name already exists, reuse it.
// `_blank` is reserved and never reuses.
@@ -755,7 +756,7 @@ pub fn close(self: *Window) void {
// Per spec, close() is only honored on script-opened windows. That
// maps exactly to membership in page.popups.
const frame = self._frame;
- const page = frame._page;
+ const page = frame.page;
var popup_index: usize = 0;
while (popup_index < page.popups.items.len) : (popup_index += 1) {
@@ -913,13 +914,13 @@ pub fn getScrollY(self: *const Window) u32 {
}
fn getInnerWidth(_: *const Window, frame: *Frame) u32 {
- return frame._page.getViewport().width;
+ return frame.page.getViewport().width;
}
// Faux-layout viewport height, used to decide whether an element is already
// within view (e.g. scrollIntoViewIfNeeded).
pub fn getInnerHeight(_: *const Window, frame: *Frame) u32 {
- return frame._page.getViewport().height;
+ return frame.page.getViewport().height;
}
pub fn scrollTo(self: *Window, opts: Element.ScrollToOpts, y: ?i32, frame: *Frame) !void {
@@ -949,7 +950,7 @@ pub fn scrollTo(self: *Window, opts: Element.ScrollToOpts, y: ?i32, frame: *Fram
return null;
}
- const event = try Event.initTrusted(comptime .wrap("scroll"), .{ .bubbles = true }, f._page);
+ const event = try Event.initTrusted(comptime .wrap("scroll"), .{ .bubbles = true }, f.page);
try f._event_manager.dispatch(f.document.asEventTarget(), event);
pos.state = .end;
@@ -975,7 +976,7 @@ pub fn scrollTo(self: *Window, opts: Element.ScrollToOpts, y: ?i32, frame: *Fram
.end => {},
.done => return null,
}
- const event = try Event.initTrusted(comptime .wrap("scrollend"), .{ .bubbles = true }, f._page);
+ const event = try Event.initTrusted(comptime .wrap("scrollend"), .{ .bubbles = true }, f.page);
try f._event_manager.dispatch(f.document.asEventTarget(), event);
pos.state = .done;
@@ -1016,7 +1017,7 @@ pub fn unhandledPromiseRejection(self: *Window, no_handler: bool, rejection: js.
};
if (no_handler) {
- frame._page.recordJsError(error.JsException);
+ frame.page.recordJsError(error.JsException);
}
const target = self.asEventTarget();
@@ -1024,7 +1025,7 @@ pub fn unhandledPromiseRejection(self: *Window, no_handler: bool, rejection: js.
const event = (try @import("event/PromiseRejectionEvent.zig").init(event_name, .{
.reason = if (rejection.reason()) |r| try r.persist() else null,
.promise = try rejection.promise().persist(),
- }, frame._page)).asEvent();
+ }, frame.page)).asEvent();
try frame._event_manager.dispatchDirect(target, event, attribute_callback, .{ .context = "window.unhandledrejection" });
}
}
@@ -1099,7 +1100,7 @@ const PostMessageCallback = struct {
.ports = self.ports,
.bubbles = false,
.cancelable = false,
- }, frame._page)).asEvent();
+ }, frame.page)).asEvent();
try frame._event_manager.dispatchDirect(event_target, event, window._on_message, .{ .context = "window.postMessage" });
return null;
diff --git a/src/browser/webapi/Worker.zig b/src/browser/webapi/Worker.zig
index 7ffd8263a..114ce559d 100644
--- a/src/browser/webapi/Worker.zig
+++ b/src/browser/webapi/Worker.zig
@@ -75,7 +75,7 @@ pub fn init(url: []const u8, options: ?WorkerOptions, frame: *Frame) !*Worker {
errdefer arena.release();
const resolved_url = try URL.resolve(arena.allocator(), frame.base(), url, .{ .encoding = frame.charset });
- const self = try frame._page.factory.eventTargetWithAllocator(arena.allocator(), Worker{
+ const self = try frame.page.factory.eventTargetWithAllocator(arena.allocator(), Worker{
._arena = arena,
._proto = undefined,
._frame = frame,
@@ -320,7 +320,7 @@ fn _fireErrorEvent(self: *Worker, message: []const u8, error_value: ?js.Value.Gl
.filename = self._url,
.bubbles = false,
.cancelable = true,
- }, frame._page);
+ }, frame.page);
try frame._event_manager.dispatchDirect(target, error_event.asEvent(), on_error, .{
.context = "Worker.onerror",
@@ -441,7 +441,7 @@ const ReceiveMessageCallback = struct {
.data = .{ .string = @errorName(err) },
.bubbles = false,
.cancelable = false,
- }, frame._page)).asEvent();
+ }, frame.page)).asEvent();
try frame._event_manager.dispatchDirect(target, event, on_messageerror, .{ .context = "Worker.messageerror" });
return null;
};
@@ -458,7 +458,7 @@ const ReceiveMessageCallback = struct {
.data = .{ .value = data },
.bubbles = false,
.cancelable = false,
- }, frame._page)).asEvent();
+ }, frame.page)).asEvent();
try frame._event_manager.dispatchDirect(target, event, on_message, .{ .context = "Worker.receiveMessage" });
diff --git a/src/browser/webapi/WorkerGlobalScope.zig b/src/browser/webapi/WorkerGlobalScope.zig
index 5a060e792..7bf186f5b 100644
--- a/src/browser/webapi/WorkerGlobalScope.zig
+++ b/src/browser/webapi/WorkerGlobalScope.zig
@@ -65,7 +65,7 @@ _is_module: bool,
// Meant to follow the same field naming as Page so that an anytype of generic
// can access these the same for a Page of a WGS.
// These fields represent the "Page"-like component of the WGS
-_page: *Page,
+page: *Page,
_session: *Session,
_factory: *Factory,
_identity: JS.Identity = .{},
@@ -155,7 +155,7 @@ pub fn init(
.call_arena = call_arena.allocator(),
.local_arena = local_arena.allocator(),
._frame = frame,
- ._page = frame._page,
+ .page = frame.page,
._session = session,
._identity = .{},
._type = undefined,
@@ -201,7 +201,7 @@ pub fn init(
}
pub fn deinit(self: *WorkerGlobalScope) void {
- const page = self._page;
+ const page = self.page;
const session = page.session;
const browser = session.browser;
@@ -246,7 +246,7 @@ pub fn dispatch(
target,
event,
handler,
- self._page,
+ self.page,
opts,
);
}
@@ -378,7 +378,7 @@ pub fn unhandledPromiseRejection(self: *WorkerGlobalScope, no_handler: bool, rej
};
if (no_handler) {
- self._page.recordJsError(error.JsException);
+ self.page.recordJsError(error.JsException);
}
const target = self.asEventTarget();
@@ -386,7 +386,7 @@ pub fn unhandledPromiseRejection(self: *WorkerGlobalScope, no_handler: bool, rej
const event = (try @import("event/PromiseRejectionEvent.zig").init(event_name, .{
.reason = if (rejection.reason()) |r| try r.persist() else null,
.promise = try rejection.promise().persist(),
- }, self._page)).asEvent();
+ }, self.page)).asEvent();
try self.dispatch(target, event, attribute_callback, .{});
}
}
@@ -453,7 +453,7 @@ fn importScript(self: *WorkerGlobalScope, arena: Allocator, url: [:0]const u8) !
defer try_catch.deinit();
_ = ls.local.eval(response.body.items, url) catch |err| {
- self._page.recordJsError(err);
+ self.page.recordJsError(err);
const caught = try_catch.caughtOrError(arena, err);
log.err(.browser, "importScript", .{ .url = resolved_url, .caught = caught });
return;
@@ -463,14 +463,14 @@ fn importScript(self: *WorkerGlobalScope, arena: Allocator, url: [:0]const u8) !
}
pub fn reportError(self: *WorkerGlobalScope, err: JS.Value) !void {
- self._page.recordJsError(error.JsException);
+ self.page.recordJsError(error.JsException);
const error_event = try ErrorEvent.initTrusted(comptime .wrap("error"), .{
.@"error" = try err.persist(),
.message = err.toStringSlice() catch "Unknown error",
.bubbles = false,
.cancelable = true,
- }, self._page);
+ }, self.page);
// Invoke onerror callback if set (per WHATWG spec, this is called
// with 5 arguments: message, source, lineno, colno, error)
@@ -499,7 +499,7 @@ pub fn reportError(self: *WorkerGlobalScope, err: JS.Value) !void {
const event = error_event.asEvent();
// Keep the event alive past dispatch so we can read _prevent_default.
event.acquireRef();
- defer _ = event.releaseRef(self._page);
+ defer _ = event.releaseRef(self.page);
event._prevent_default = prevent_default;
// Pass null as handler: onerror was already called above with 5 args.
diff --git a/src/browser/webapi/animation/Animation.zig b/src/browser/webapi/animation/Animation.zig
index 8a4373e9d..b16a91c05 100644
--- a/src/browser/webapi/animation/Animation.zig
+++ b/src/browser/webapi/animation/Animation.zig
@@ -84,7 +84,7 @@ pub fn play(self: *Animation, frame: *Frame) !void {
// Schedule the transition from .running => .finished in 10ms.
self.acquireRef();
- errdefer self.releaseRef(frame._page);
+ errdefer self.releaseRef(frame.page);
try frame.js.scheduler.add(
self,
Animation.update,
@@ -97,7 +97,7 @@ pub fn play(self: *Animation, frame: *Frame) !void {
// and `cancelled` are mutually exclusive, so play()'s ref is released once.
fn cancelled(ctx: *anyopaque) void {
const self: *Animation = @ptrCast(@alignCast(ctx));
- self.releaseRef(self._frame._page);
+ self.releaseRef(self._frame.page);
}
pub fn pause(self: *Animation) void {
@@ -217,7 +217,7 @@ fn update(ctx: *anyopaque) !?u32 {
}
// No future change scheduled, set the object weak for garbage collection.
- self.releaseRef(self._frame._page);
+ self.releaseRef(self._frame.page);
return null;
}
diff --git a/src/browser/webapi/collections/ChildNodes.zig b/src/browser/webapi/collections/ChildNodes.zig
index 9609451ad..2880092ef 100644
--- a/src/browser/webapi/collections/ChildNodes.zig
+++ b/src/browser/webapi/collections/ChildNodes.zig
@@ -51,7 +51,7 @@ pub fn init(node: *Node, frame: *Frame) !*ChildNodes {
._last_index = 0,
._last_node = null,
._last_length = null,
- ._cached_version = frame._page.dom_version,
+ ._cached_version = frame.page.dom_version,
};
return self;
}
@@ -118,7 +118,7 @@ pub fn entries(self: *ChildNodes, frame: *Frame) !*EntryIterator {
}
fn versionCheck(self: *ChildNodes, frame: *const Frame) bool {
- const current = frame._page.dom_version;
+ const current = frame.page.dom_version;
if (current == self._cached_version) {
return true;
}
diff --git a/src/browser/webapi/collections/DOMTokenList.zig b/src/browser/webapi/collections/DOMTokenList.zig
index 68365df37..49514219d 100644
--- a/src/browser/webapi/collections/DOMTokenList.zig
+++ b/src/browser/webapi/collections/DOMTokenList.zig
@@ -248,7 +248,7 @@ pub fn forEach(self: *DOMTokenList, cb_: js.Function, js_this_: ?js.Object, fram
}
var caught: js.TryCatch.Caught = .{};
cb.tryCall(void, .{ token, i, self }, &caught) catch |err| {
- frame._page.recordJsError(err);
+ frame.page.recordJsError(err);
log.debug(.js, "forEach callback", .{ .caught = caught, .source = "DOMTokenList" });
return;
};
diff --git a/src/browser/webapi/collections/NodeList.zig b/src/browser/webapi/collections/NodeList.zig
index 9733093a4..da685ca7e 100644
--- a/src/browser/webapi/collections/NodeList.zig
+++ b/src/browser/webapi/collections/NodeList.zig
@@ -99,7 +99,7 @@ pub fn forEach(self: *NodeList, cb: js.Function, frame: *Frame) !void {
var caught: js.TryCatch.Caught = .{};
cb.tryCall(void, .{ node, i, self }, &caught) catch |err| {
- frame._page.recordJsError(err);
+ frame.page.recordJsError(err);
log.debug(.js, "forEach callback", .{ .caught = caught, .source = "nodelist" });
return;
};
diff --git a/src/browser/webapi/collections/node_live.zig b/src/browser/webapi/collections/node_live.zig
index 32320b8af..4c88e30e9 100644
--- a/src/browser/webapi/collections/node_live.zig
+++ b/src/browser/webapi/collections/node_live.zig
@@ -133,7 +133,7 @@ pub fn NodeLive(comptime mode: Mode) type {
._last_length = null,
._filter = filter,
._tw = TW.init(root, .{}),
- ._cached_version = frame._page.dom_version,
+ ._cached_version = frame.page.dom_version,
};
}
@@ -402,7 +402,7 @@ pub fn NodeLive(comptime mode: Mode) type {
}
fn versionCheck(self: *Self, frame: *const Frame) bool {
- const current = frame._page.dom_version;
+ const current = frame.page.dom_version;
if (current == self._cached_version) {
return true;
}
diff --git a/src/browser/webapi/css/FontFaceSet.zig b/src/browser/webapi/css/FontFaceSet.zig
index 203082852..bf0936cfa 100644
--- a/src/browser/webapi/css/FontFaceSet.zig
+++ b/src/browser/webapi/css/FontFaceSet.zig
@@ -82,13 +82,13 @@ pub fn load(self: *FontFaceSet, font: []const u8, frame: *Frame) !js.Promise {
// Dispatch loading event
const target = self.asEventTarget();
if (frame._event_manager.hasDirectListeners(target, "loading", null)) {
- const event = try Event.initTrusted(comptime .wrap("loading"), .{}, frame._page);
+ const event = try Event.initTrusted(comptime .wrap("loading"), .{}, frame.page);
try frame._event_manager.dispatchDirect(target, event, null, .{ .context = "load font face set" });
}
// Dispatch loadingdone event
if (frame._event_manager.hasDirectListeners(target, "loadingdone", null)) {
- const event = try Event.initTrusted(comptime .wrap("loadingdone"), .{}, frame._page);
+ const event = try Event.initTrusted(comptime .wrap("loadingdone"), .{}, frame.page);
try frame._event_manager.dispatchDirect(target, event, null, .{ .context = "load font face set" });
}
diff --git a/src/browser/webapi/css/MediaQueryList.zig b/src/browser/webapi/css/MediaQueryList.zig
index 42ecb9ef5..bd38efffb 100644
--- a/src/browser/webapi/css/MediaQueryList.zig
+++ b/src/browser/webapi/css/MediaQueryList.zig
@@ -43,7 +43,7 @@ pub fn init(query: []const u8, frame: *Frame) !*MediaQueryList {
._proto = undefined,
._media = media,
._frame = frame,
- ._matches = MediaQuery.matches(media, frame._page.getViewport()),
+ ._matches = MediaQuery.matches(media, frame.page.getViewport()),
});
try frame._media_query_lists.append(frame.arena, self);
return self;
@@ -62,7 +62,7 @@ pub fn getMedia(self: *const MediaQueryList) []const u8 {
/// from the page (overridable via Emulation.setDeviceMetricsOverride),
/// matching `Window.innerWidth` / `innerHeight`.
fn getMatches(self: *const MediaQueryList) bool {
- return MediaQuery.matches(self._media, self._frame._page.getViewport());
+ return MediaQuery.matches(self._media, self._frame.page.getViewport());
}
pub fn viewportChanged(self: *MediaQueryList) void {
diff --git a/src/browser/webapi/element/Attribute.zig b/src/browser/webapi/element/Attribute.zig
index 6e91876cf..52721c4fe 100644
--- a/src/browser/webapi/element/Attribute.zig
+++ b/src/browser/webapi/element/Attribute.zig
@@ -126,7 +126,7 @@ pub const JsApi = struct {
// Attribute value (the same JSValue) when called multiple time, and that gets
// more important when you look at the [hardly every used] el.removeAttributeNode
// and setAttributeNode.
-// So, we maintain a lookup, frame._attribute_lookup, to serve as an identity map
+// So, we maintain a lookup, page.attribute_lookup, to serve as an identity map
// from our internal Entry to a proper Attribute. This is lazily populated
// whenever an Attribute is created. Why not just have an ?*Attribute field
// in our Entry? Because that would require an extra 8 bytes for every single
@@ -141,7 +141,7 @@ pub const List = struct {
pub const Lookup = std.AutoHashMapUnmanaged(LookupKey, *Attribute);
- // for Frame._attribute_lookup which is our identity map for attributes
+ // for Page.attribute_lookup which is our identity map for attributes
const LookupKey = struct {
list: *const List,
// canonical (see canonicalizeName), so identity is the address
@@ -210,13 +210,12 @@ pub const List = struct {
}
// Identity map access: a given (list, name) always yields the same
- // *Attribute until the attribute is removed. The map must be the
- // element's frame's, not the caller's frame.
+ // *Attribute until the attribute is removed.
pub fn getOrCreateAttribute(self: *const List, entry: *const Entry, element: *Element, frame: *Frame) !*Attribute {
- const owner = element.ownerFrame(frame) orelse frame;
- const gop = try owner._attribute_lookup.getOrPut(owner.arena, .{ .list = self, .name = entry._name_ptr });
+ const page = frame.page;
+ const gop = try page.attribute_lookup.getOrPut(page.frame_arena, .{ .list = self, .name = entry._name_ptr });
if (!gop.found_existing) {
- gop.value_ptr.* = try entry.toAttribute(element, owner);
+ gop.value_ptr.* = try entry.toAttribute(element, element.ownerFrame(frame) orelse frame);
}
return gop.value_ptr.*;
}
@@ -304,8 +303,8 @@ pub const List = struct {
const name = try self.put(attribute._name, attribute._value, element, frame);
attribute._element = element;
- const owner = element.ownerFrame(frame) orelse frame;
- try owner._attribute_lookup.put(owner.arena, .{ .list = self, .name = name.ptr }, attribute);
+ const page = frame.page;
+ try page.attribute_lookup.put(page.frame_arena, .{ .list = self, .name = name.ptr }, attribute);
return existing_attribute;
}
@@ -352,7 +351,7 @@ pub const List = struct {
// remove this BEFORE triggering anything, incase that re-enters delete
// or some other callback.
- if (owner._attribute_lookup.fetchRemove(.{ .list = self, .name = entry._name_ptr })) |kv| {
+ if (frame.page.attribute_lookup.fetchRemove(.{ .list = self, .name = entry._name_ptr })) |kv| {
// The attribute can still be alive
kv.value._element = null;
}
@@ -538,17 +537,17 @@ pub fn validateAttributeName(name: String) !void {
}
// Every stored entry name either comes from the static String.intern or from
-// the frame._attribute_names. Beyond avoiding extra dupes/allocations, this
-// gives a stable pointer for the frame's lifetime, which List.LookupKey
-// relies on for identity. The pointer is NOT comparable across frames (each
-// frame has its own pool), which is why lookups byte-compare.
+// the page's attribute_names. Beyond avoiding extra dupes/allocations, this
+// gives a stable pointer for the page's lifetime, which List.LookupKey
+// relies on for identity.
fn canonicalizeName(name: []const u8, frame: *Frame) ![]const u8 {
if (String.intern(name)) |static| {
return static;
}
- const gop = try frame._attribute_names.getOrPut(frame.arena, name);
+ const page = frame.page;
+ const gop = try page.attribute_names.getOrPut(page.frame_arena, name);
if (!gop.found_existing) {
- gop.key_ptr.* = try frame.arena.dupe(u8, name);
+ gop.key_ptr.* = try page.frame_arena.dupe(u8, name);
}
return gop.key_ptr.*;
}
diff --git a/src/browser/webapi/element/Html.zig b/src/browser/webapi/element/Html.zig
index fa6e6f004..0835b0bb3 100644
--- a/src/browser/webapi/element/Html.zig
+++ b/src/browser/webapi/element/Html.zig
@@ -423,7 +423,7 @@ pub fn click(self: *HtmlElement, frame: *Frame) !void {
// Keep the event alive past dispatch (which runs handlers/microtasks) so we
// can read _prevent_default afterwards.
event.acquireRef();
- defer _ = event.releaseRef(frame._page);
+ defer _ = event.releaseRef(frame.page);
try frame._event_manager.dispatch(self.asEventTarget(), event);
diff --git a/src/browser/webapi/element/html/Button.zig b/src/browser/webapi/element/html/Button.zig
index 4295a2f1f..724d37585 100644
--- a/src/browser/webapi/element/html/Button.zig
+++ b/src/browser/webapi/element/html/Button.zig
@@ -165,7 +165,7 @@ pub fn checkValidity(self: *Button, frame: *Frame) !bool {
if (!self.getWillValidate()) return true;
if (self._custom_validity == null) return true;
- const event = try Event.initTrusted(comptime .wrap("invalid"), .{ .cancelable = true }, frame._page);
+ const event = try Event.initTrusted(comptime .wrap("invalid"), .{ .cancelable = true }, frame.page);
try frame._event_manager.dispatch(self.asElement().asEventTarget(), event);
return false;
}
diff --git a/src/browser/webapi/element/html/Dialog.zig b/src/browser/webapi/element/html/Dialog.zig
index c2b88c5d8..9cdfb9833 100644
--- a/src/browser/webapi/element/html/Dialog.zig
+++ b/src/browser/webapi/element/html/Dialog.zig
@@ -52,7 +52,7 @@ pub fn close(self: *Dialog, return_value: ?[]const u8, frame: *Frame) !void {
if (return_value) |v| {
try self.asElement().setAttributeSafe(comptime .wrap("returnvalue"), .wrap(v), frame);
}
- const event = try Event.init("close", .{ .bubbles = false, .cancelable = false }, frame._page);
+ const event = try Event.init("close", .{ .bubbles = false, .cancelable = false }, frame.page);
try frame._event_manager.dispatch(self.asElement().asEventTarget(), event);
}
diff --git a/src/browser/webapi/element/html/Input.zig b/src/browser/webapi/element/html/Input.zig
index 397717996..2ae514394 100644
--- a/src/browser/webapi/element/html/Input.zig
+++ b/src/browser/webapi/element/html/Input.zig
@@ -288,9 +288,9 @@ pub fn selectFiles(self: *Input, files: []const *File, frame: *Frame) !void {
// A file input fires `input` then `change`, both as plain bubbling Events
// (not InputEvents — `inputType`/`data` only apply to editable text inputs).
- const input_evt = try Event.initTrusted(comptime .wrap("input"), .{ .bubbles = true }, frame._page);
+ const input_evt = try Event.initTrusted(comptime .wrap("input"), .{ .bubbles = true }, frame.page);
try frame._event_manager.dispatch(self.asElement().asEventTarget(), input_evt);
- const change_evt = try Event.initTrusted(comptime .wrap("change"), .{ .bubbles = true }, frame._page);
+ const change_evt = try Event.initTrusted(comptime .wrap("change"), .{ .bubbles = true }, frame.page);
try frame._event_manager.dispatch(self.asElement().asEventTarget(), change_evt);
}
@@ -310,7 +310,7 @@ fn replaceFiles(self: *Input, files: []const *File, frame: *Frame) !void {
}
for (fl._files) |old| {
- old._proto.releaseRef(frame._page);
+ old._proto.releaseRef(frame.page);
}
fl._files = dupe;
@@ -365,7 +365,7 @@ pub fn checkValidity(self: *Input, frame: *Frame) !bool {
const v = ValidityState{ ._owner = self.asElement() };
if (v.getValid(frame)) return true;
- const event = try Event.initTrusted(comptime .wrap("invalid"), .{ .cancelable = true }, frame._page);
+ const event = try Event.initTrusted(comptime .wrap("invalid"), .{ .cancelable = true }, frame.page);
try frame._event_manager.dispatch(self.asElement().asEventTarget(), event);
return false;
}
diff --git a/src/browser/webapi/element/html/Media.zig b/src/browser/webapi/element/html/Media.zig
index 5c5b9bbc1..1aa7a6ff1 100644
--- a/src/browser/webapi/element/html/Media.zig
+++ b/src/browser/webapi/element/html/Media.zig
@@ -184,7 +184,7 @@ pub fn load(self: *Media, frame: *Frame) !void {
}
fn dispatchEvent(self: *Media, name: []const u8, frame: *Frame) !void {
- const event = try Event.init(name, .{ .bubbles = false, .cancelable = false }, frame._page);
+ const event = try Event.init(name, .{ .bubbles = false, .cancelable = false }, frame.page);
try frame._event_manager.dispatch(self.asElement().asEventTarget(), event);
}
diff --git a/src/browser/webapi/element/html/Select.zig b/src/browser/webapi/element/html/Select.zig
index fbda4d009..da9b2fd5e 100644
--- a/src/browser/webapi/element/html/Select.zig
+++ b/src/browser/webapi/element/html/Select.zig
@@ -430,7 +430,7 @@ pub fn checkValidity(self: *Select, frame: *Frame) !bool {
const v = ValidityState{ ._owner = self.asElement() };
if (v.getValid(frame)) return true;
- const event = try Event.initTrusted(comptime .wrap("invalid"), .{ .cancelable = true }, frame._page);
+ const event = try Event.initTrusted(comptime .wrap("invalid"), .{ .cancelable = true }, frame.page);
try frame._event_manager.dispatch(self.asElement().asEventTarget(), event);
return false;
}
diff --git a/src/browser/webapi/element/html/Slot.zig b/src/browser/webapi/element/html/Slot.zig
index b3ca88d3b..864414aed 100644
--- a/src/browser/webapi/element/html/Slot.zig
+++ b/src/browser/webapi/element/html/Slot.zig
@@ -119,13 +119,14 @@ pub fn assign(self: *Slot, values: []const js.Value, frame: *Frame) !void {
entry.* = node;
}
+ const page = frame.page;
for (self._manually_assigned.items) |node| {
- _ = frame._manual_slot_assignments.remove(node);
+ _ = page._manual_slot_assignments.remove(node);
}
self._manually_assigned.clearRetainingCapacity();
for (nodes) |node| {
- const gop = try frame._manual_slot_assignments.getOrPut(frame.arena, node);
+ const gop = try page._manual_slot_assignments.getOrPut(page.frame_arena, node);
if (gop.found_existing) {
const other = gop.value_ptr.*;
if (other == self) {
diff --git a/src/browser/webapi/element/html/TextArea.zig b/src/browser/webapi/element/html/TextArea.zig
index 7d7500dd9..b9e63f394 100644
--- a/src/browser/webapi/element/html/TextArea.zig
+++ b/src/browser/webapi/element/html/TextArea.zig
@@ -218,7 +218,7 @@ pub fn checkValidity(self: *TextArea, frame: *Frame) !bool {
const v = ValidityState{ ._owner = self.asElement() };
if (v.getValid(frame)) return true;
- const event = try Event.initTrusted(comptime .wrap("invalid"), .{ .cancelable = true }, frame._page);
+ const event = try Event.initTrusted(comptime .wrap("invalid"), .{ .cancelable = true }, frame.page);
try frame._event_manager.dispatch(self.asElement().asEventTarget(), event);
return false;
}
diff --git a/src/browser/webapi/element/popover.zig b/src/browser/webapi/element/popover.zig
index 4912473de..cf76f979f 100644
--- a/src/browser/webapi/element/popover.zig
+++ b/src/browser/webapi/element/popover.zig
@@ -252,7 +252,7 @@ fn fireToggle(
// Keep the event alive while dispatching so we can read _prevent_default.
event.acquireRef();
- defer _ = event.releaseRef(frame._page);
+ defer _ = event.releaseRef(frame.page);
try frame._event_manager.dispatch(el.asEventTarget(), event);
return event._prevent_default;
diff --git a/src/browser/webapi/element/slotting.zig b/src/browser/webapi/element/slotting.zig
index a1ffbb820..1f72f8705 100644
--- a/src/browser/webapi/element/slotting.zig
+++ b/src/browser/webapi/element/slotting.zig
@@ -50,7 +50,7 @@ pub fn findSlot(slottable: *Node, comptime open_only: bool, frame: *Frame) ?*Slo
const shadow_node = shadow_root.asNode();
if (shadow_root._slot_assignment == .manual) {
- const slot = frame._manual_slot_assignments.get(slottable) orelse return null;
+ const slot = frame.page._manual_slot_assignments.get(slottable) orelse return null;
if (slot.asNode().getRootNode(.{}) != shadow_node) {
return null;
}
@@ -130,16 +130,17 @@ fn _assignSlottables(slot: *Slot, frame: *Frame) !void {
frame.signalSlotChange(slot);
+ const page = frame.page;
for (old) |node| {
- if (frame._assigned_slots.get(node) == slot) {
- _ = frame._assigned_slots.remove(node);
+ if (page._assigned_slots.get(node) == slot) {
+ _ = page._assigned_slots.remove(node);
node._flags.assigned_slot = false;
}
}
slot._assigned.clearRetainingCapacity();
try slot._assigned.appendSlice(frame.arena, slottables.items);
for (slottables.items) |node| {
- try frame._assigned_slots.put(frame.arena, node, slot);
+ try page._assigned_slots.put(page.frame_arena, node, slot);
node._flags.assigned_slot = true;
}
}
@@ -202,7 +203,7 @@ pub fn insertionSteps(parent: *Node, child: *Node, in_fragment_parse: bool, fram
// DOM spec removing steps that affect slot assignment. Runs after child has
// been unlinked from parent.
pub fn removalSteps(parent: *Node, child: *Node, frame: *Frame) void {
- if (frame._element_shadow_roots.count() == 0) {
+ if (frame.page.element_shadow_roots.count() == 0) {
// shortcut
return;
}
@@ -233,7 +234,7 @@ pub fn slotAttributeChanged(slottable: *Node, old_value: []const u8, value: []co
if (std.mem.eql(u8, old_value, value)) {
return;
}
- if (frame._element_shadow_roots.count() == 0) {
+ if (frame.page.element_shadow_roots.count() == 0) {
return;
}
if (slottable.assignedSlot(frame)) |old_slot| {
diff --git a/src/browser/webapi/element/svg/Geometry.zig b/src/browser/webapi/element/svg/Geometry.zig
index 541514f67..9dd227342 100644
--- a/src/browser/webapi/element/svg/Geometry.zig
+++ b/src/browser/webapi/element/svg/Geometry.zig
@@ -126,7 +126,7 @@ fn getPointAtLength(self: *Geometry, distance: f64, frame: *Frame) !*DOMPoint {
var path = try self.buildPath(frame);
defer path.deinit(frame.local_arena);
const point = try path.pointAtLength(distance, frame.local_arena);
- return DOMPoint.create(point.x, point.y, 0, 1, frame._page);
+ return DOMPoint.create(point.x, point.y, 0, 1, frame.page);
}
pub fn buildPath(self: *Geometry, frame: *Frame) !PathData.Path {
diff --git a/src/browser/webapi/element/svg/Graphics.zig b/src/browser/webapi/element/svg/Graphics.zig
index 959a9d52d..6c96bf288 100644
--- a/src/browser/webapi/element/svg/Graphics.zig
+++ b/src/browser/webapi/element/svg/Graphics.zig
@@ -264,7 +264,7 @@ fn currentTransformMatrix(self: *Graphics, space: enum { viewport, screen }, fra
matrix.c, matrix.d, 0, 0,
0, 0, 1, 0,
matrix.e, matrix.f, 0, 1,
- }, true, frame._page);
+ }, true, frame.page);
}
fn transformMatrix(element: *Element) PathData.Matrix {
diff --git a/src/browser/webapi/element/svg/Svg.zig b/src/browser/webapi/element/svg/Svg.zig
index fb58448bf..dd1cff04e 100644
--- a/src/browser/webapi/element/svg/Svg.zig
+++ b/src/browser/webapi/element/svg/Svg.zig
@@ -87,7 +87,7 @@ fn getPreserveAspectRatio(self: *Svg, frame: *Frame) !*AnimatedPreserveAspectRat
}
fn createSVGPoint(_: *Svg, frame: *Frame) !*DOMPoint {
- const point = try DOMPoint.create(0, 0, 0, 1, frame._page);
+ const point = try DOMPoint.create(0, 0, 0, 1, frame.page);
point._proto.restrict();
return point;
}
@@ -99,7 +99,7 @@ fn createSVGMatrix(_: *Svg, frame: *Frame) !*DOMMatrix {
0, 0, 1, 0,
0, 0, 0, 1,
};
- return DOMMatrix.create(identity, true, frame._page);
+ return DOMMatrix.create(identity, true, frame.page);
}
fn createSVGRect(_: *Svg, frame: *Frame) !*DOMRect {
diff --git a/src/browser/webapi/element/text_entry.zig b/src/browser/webapi/element/text_entry.zig
index c9c39cf95..b5b31a704 100644
--- a/src/browser/webapi/element/text_entry.zig
+++ b/src/browser/webapi/element/text_entry.zig
@@ -32,7 +32,7 @@ pub fn TextEntry(comptime T: type) type {
pub fn select(self: *T, frame: *Frame) !void {
const len: u32 = @intCast(self.getValue().len);
try setSelectionRange(self, 0, len, null, frame);
- const event = try Event.init("select", .{ .bubbles = true }, frame._page);
+ const event = try Event.init("select", .{ .bubbles = true }, frame.page);
try frame._event_manager.dispatch(self.asElement().asEventTarget(), event);
}
@@ -290,7 +290,7 @@ pub fn TextEntry(comptime T: type) type {
}
fn dispatchSelectionChangeEvent(self: *T, frame: *Frame) !void {
- const event = try Event.init("selectionchange", .{ .bubbles = true }, frame._page);
+ const event = try Event.init("selectionchange", .{ .bubbles = true }, frame.page);
try frame._event_manager.dispatch(self.asElement().asEventTarget(), event);
}
diff --git a/src/browser/webapi/navigation/NavigationHistoryEntry.zig b/src/browser/webapi/navigation/NavigationHistoryEntry.zig
index 36bef1cb9..466dfc6f3 100644
--- a/src/browser/webapi/navigation/NavigationHistoryEntry.zig
+++ b/src/browser/webapi/navigation/NavigationHistoryEntry.zig
@@ -85,7 +85,7 @@ pub fn getState(self: *const NavigationHistoryEntry, frame: *Frame) !StateReturn
pub fn fireDispose(self: *NavigationHistoryEntry, frame: *Frame) !void {
if (!frame.hasDirectListeners(self.asEventTarget(), "dispose", self._on_dispose)) return;
- const event = try Event.initTrusted(comptime .wrap("dispose"), .{}, frame._page);
+ const event = try Event.initTrusted(comptime .wrap("dispose"), .{}, frame.page);
try frame.dispatch(self.asEventTarget(), event, self._on_dispose, .{ .context = "NavigationHistoryEntry" });
}
diff --git a/src/browser/webapi/net/FormData.zig b/src/browser/webapi/net/FormData.zig
index 5c82cb8ef..6eeb18caf 100644
--- a/src/browser/webapi/net/FormData.zig
+++ b/src/browser/webapi/net/FormData.zig
@@ -1024,8 +1024,8 @@ test "FormData: multipart with file" {
const frame = try testing.createFrame();
defer testing.test_session.closeAllPages();
- const file = try buildTestFile(allocator, frame._page, "hello.txt", "text/plain", "hello");
- defer file._proto.releaseRef(frame._page);
+ const file = try buildTestFile(allocator, frame.page, "hello.txt", "text/plain", "hello");
+ defer file._proto.releaseRef(frame.page);
var fd = FormData{
._rc = .{},
@@ -1061,8 +1061,8 @@ test "FormData: multipart with empty file defaults to octet-stream" {
const frame = try testing.createFrame();
defer testing.test_session.closeAllPages();
- const file = try buildTestFile(allocator, frame._page, "", "", "");
- defer file._proto.releaseRef(frame._page);
+ const file = try buildTestFile(allocator, frame.page, "", "", "");
+ defer file._proto.releaseRef(frame.page);
var fd = FormData{
._rc = .{},
@@ -1094,8 +1094,8 @@ test "FormData: multipart escapes file name and filename" {
const frame = try testing.createFrame();
defer testing.test_session.closeAllPages();
- const file = try buildTestFile(allocator, frame._page, "a\"b\r\nc.txt", "text/plain", "x");
- defer file._proto.releaseRef(frame._page);
+ const file = try buildTestFile(allocator, frame.page, "a\"b\r\nc.txt", "text/plain", "x");
+ defer file._proto.releaseRef(frame.page);
var fd = FormData{
._rc = .{},
@@ -1127,8 +1127,8 @@ test "FormData: file entry collapses to filename in urlencode" {
const frame = try testing.createFrame();
defer testing.test_session.closeAllPages();
- const file = try buildTestFile(allocator, frame._page, "hello.txt", "text/plain", "hello");
- defer file._proto.releaseRef(frame._page);
+ const file = try buildTestFile(allocator, frame.page, "hello.txt", "text/plain", "hello");
+ defer file._proto.releaseRef(frame.page);
var fd = FormData{
._rc = .{},
@@ -1330,7 +1330,7 @@ test "FormData: multipart parse with file" {
"bytes\r\n" ++
"--B--\r\n", "B", &frame.js.execution);
defer for (fd._entries.items) |entry| switch (entry.value) {
- .file => |file| file.releaseRef(frame._page),
+ .file => |file| file.releaseRef(frame.page),
else => {},
};
diff --git a/src/browser/webapi/svg/Angle.zig b/src/browser/webapi/svg/Angle.zig
index d726ed544..88ab69023 100644
--- a/src/browser/webapi/svg/Angle.zig
+++ b/src/browser/webapi/svg/Angle.zig
@@ -46,7 +46,7 @@ const Unit = enum(u16) {
};
pub fn detached(frame: *Frame) !*Angle {
- const arena = try frame._page.getArena(.tiny, "SVGAngle");
+ const arena = try frame.page.getArena(.tiny, "SVGAngle");
errdefer arena.release();
const self = try arena.create(Angle);
self.* = .{ ._arena = arena };
diff --git a/src/browser/webapi/svg/AnimatedEnumeration.zig b/src/browser/webapi/svg/AnimatedEnumeration.zig
index b77d63e2b..c1050bea1 100644
--- a/src/browser/webapi/svg/AnimatedEnumeration.zig
+++ b/src/browser/webapi/svg/AnimatedEnumeration.zig
@@ -124,9 +124,10 @@ 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 gop = try frame._svg_animated_enumerations.getOrPut(frame.arena, key);
+ const page = frame.page;
+ const gop = try page.svg_animated_enumerations.getOrPut(page.frame_arena, key);
if (!gop.found_existing) {
- errdefer _ = frame._svg_animated_enumerations.remove(key);
+ errdefer _ = page.svg_animated_enumerations.remove(key);
gop.value_ptr.* = try create(
element,
kind.attributeName(),
diff --git a/src/browser/webapi/svg/AnimatedLength.zig b/src/browser/webapi/svg/AnimatedLength.zig
index ce63cff25..861bf2e3a 100644
--- a/src/browser/webapi/svg/AnimatedLength.zig
+++ b/src/browser/webapi/svg/AnimatedLength.zig
@@ -193,9 +193,10 @@ pub fn getOrCreate(element: *Element, kind: Kind, frame: *Frame) !*AnimatedLengt
.element = element,
.kind = kind,
};
- const gop = try frame._svg_animated_lengths.getOrPut(frame.arena, key);
+ const page = frame.page;
+ const gop = try page.svg_animated_lengths.getOrPut(page.frame_arena, key);
if (!gop.found_existing) {
- errdefer _ = frame._svg_animated_lengths.remove(key);
+ errdefer _ = page.svg_animated_lengths.remove(key);
gop.value_ptr.* = try createConfigured(
element,
kind.attributeName(),
diff --git a/src/browser/webapi/svg/AnimatedNumber.zig b/src/browser/webapi/svg/AnimatedNumber.zig
index 9eca392bc..132ae025b 100644
--- a/src/browser/webapi/svg/AnimatedNumber.zig
+++ b/src/browser/webapi/svg/AnimatedNumber.zig
@@ -57,9 +57,10 @@ 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 gop = try frame._svg_animated_numbers.getOrPut(frame.arena, key);
+ const page = frame.page;
+ const gop = try page.svg_animated_numbers.getOrPut(page.frame_arena, key);
if (!gop.found_existing) {
- errdefer _ = frame._svg_animated_numbers.remove(key);
+ errdefer _ = page.svg_animated_numbers.remove(key);
gop.value_ptr.* = try frame._factory.create(AnimatedNumber{
._element = element,
._attr_name = kind.attributeName(),
diff --git a/src/browser/webapi/svg/AnimatedPreserveAspectRatio.zig b/src/browser/webapi/svg/AnimatedPreserveAspectRatio.zig
index 20d2f4dbf..654ad4431 100644
--- a/src/browser/webapi/svg/AnimatedPreserveAspectRatio.zig
+++ b/src/browser/webapi/svg/AnimatedPreserveAspectRatio.zig
@@ -31,9 +31,10 @@ _anim_val: *PreserveAspectRatio,
pub const Lookup = std.AutoHashMapUnmanaged(*Element, *AnimatedPreserveAspectRatio);
pub fn getOrCreate(element: *Element, frame: *Frame) !*AnimatedPreserveAspectRatio {
- const gop = try frame._svg_animated_preserve_aspect_ratios.getOrPut(frame.arena, element);
+ const page = frame.page;
+ const gop = try page.svg_animated_preserve_aspect_ratios.getOrPut(page.frame_arena, element);
if (!gop.found_existing) {
- errdefer _ = frame._svg_animated_preserve_aspect_ratios.remove(element);
+ errdefer _ = page.svg_animated_preserve_aspect_ratios.remove(element);
gop.value_ptr.* = try create(element, frame);
}
return gop.value_ptr.*;
diff --git a/src/browser/webapi/svg/AnimatedString.zig b/src/browser/webapi/svg/AnimatedString.zig
index 6d0ece5ce..ea104a27b 100644
--- a/src/browser/webapi/svg/AnimatedString.zig
+++ b/src/browser/webapi/svg/AnimatedString.zig
@@ -38,12 +38,13 @@ pub const Key = struct {
kind: Kind,
};
-// Identity map for AnimatedString, help by the frame
+// Identity map for AnimatedString, held by the page
pub fn getOrCreate(element: *Element, kind: Kind, frame: *Frame) !*AnimatedString {
const key: Key = .{ .element = element, .kind = kind };
- const gop = try frame._svg_animated_strings.getOrPut(frame.arena, key);
+ const page = frame.page;
+ const gop = try page.svg_animated_strings.getOrPut(page.frame_arena, key);
if (!gop.found_existing) {
- errdefer _ = frame._svg_animated_strings.remove(key);
+ errdefer _ = page.svg_animated_strings.remove(key);
gop.value_ptr.* = try frame._factory.create(AnimatedString{
._element = element,
._kind = kind,
diff --git a/src/browser/webapi/svg/AnimatedTransformList.zig b/src/browser/webapi/svg/AnimatedTransformList.zig
index cb3172603..5f6d06f24 100644
--- a/src/browser/webapi/svg/AnimatedTransformList.zig
+++ b/src/browser/webapi/svg/AnimatedTransformList.zig
@@ -53,9 +53,10 @@ 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 gop = try frame._svg_animated_transform_lists.getOrPut(frame.arena, key);
+ const page = frame.page;
+ const gop = try page.svg_animated_transform_lists.getOrPut(page.frame_arena, key);
if (!gop.found_existing) {
- errdefer _ = frame._svg_animated_transform_lists.remove(key);
+ errdefer _ = page.svg_animated_transform_lists.remove(key);
gop.value_ptr.* = try createForAttribute(element, kind.attributeName(), frame);
}
return gop.value_ptr.*;
diff --git a/src/browser/webapi/svg/Length.zig b/src/browser/webapi/svg/Length.zig
index f93680465..61d5c833f 100644
--- a/src/browser/webapi/svg/Length.zig
+++ b/src/browser/webapi/svg/Length.zig
@@ -65,7 +65,7 @@ pub const Unit = enum(u16) {
const MAX_ANCESTOR_DEPTH = 32;
pub fn detached(frame: *Frame) !*Length {
- const arena = try frame._page.getArena(.tiny, "SVGLength");
+ const arena = try frame.page.getArena(.tiny, "SVGLength");
errdefer arena.release();
const self = try arena.create(Length);
self.* = .{ ._rc = .{}, ._arena = arena };
@@ -279,7 +279,7 @@ fn nearestSvgViewport(element: *Element) ?*Element {
}
fn pageViewportDimension(direction: Direction, frame: *Frame) f64 {
- const viewport = frame._page.getViewport();
+ const viewport = frame.page.getViewport();
return switch (direction) {
.horizontal => @floatFromInt(viewport.width),
.vertical => @floatFromInt(viewport.height),
diff --git a/src/browser/webapi/svg/Number.zig b/src/browser/webapi/svg/Number.zig
index fef890b1a..2fb4af0cf 100644
--- a/src/browser/webapi/svg/Number.zig
+++ b/src/browser/webapi/svg/Number.zig
@@ -30,7 +30,7 @@ _arena: *lp.Arena,
_value: f32 = 0,
pub fn detached(frame: *Frame) !*Number {
- const arena = try frame._page.getArena(.tiny, "SVGNumber");
+ const arena = try frame.page.getArena(.tiny, "SVGNumber");
errdefer arena.release();
const self = try arena.create(Number);
self.* = .{ ._arena = arena };
diff --git a/src/browser/webapi/svg/PointList.zig b/src/browser/webapi/svg/PointList.zig
index 7d77ee7b6..862086222 100644
--- a/src/browser/webapi/svg/PointList.zig
+++ b/src/browser/webapi/svg/PointList.zig
@@ -61,9 +61,10 @@ pub fn getOrCreate(element: *Element, kind: Kind, frame: *Frame) !*PointList {
.element = element,
.kind = kind,
};
- const gop = try frame._svg_point_lists.getOrPut(frame.arena, key);
+ const page = frame.page;
+ const gop = try page._svg_point_lists.getOrPut(page.frame_arena, key);
if (!gop.found_existing) {
- errdefer _ = frame._svg_point_lists.remove(key);
+ errdefer _ = page._svg_point_lists.remove(key);
gop.value_ptr.* = try frame._factory.create(PointList{
._frame = frame,
._element = element,
@@ -91,7 +92,7 @@ fn attrName(_: *const PointList) lp.String {
fn prepareItem(_: *PointList, item: *DOMPoint, frame: *Frame) !*DOMPoint {
if (!std.math.isFinite(item._proto._x) or !std.math.isFinite(item._proto._y)) return error.TypeError;
const prepared = if (item._proto.isAttached())
- try DOMPoint.create(item._proto._x, item._proto._y, item._proto._z, item._proto._w, frame._page)
+ try DOMPoint.create(item._proto._x, item._proto._y, item._proto._z, item._proto._w, frame.page)
else
item;
prepared._proto.acquireRef();
@@ -148,16 +149,16 @@ fn mutatePoint(
fn parse(raw: []const u8, frame: *Frame) !std.ArrayList(*DOMPoint) {
var scanner = NumberScanner{ .input = raw };
var parsed: std.ArrayList(*DOMPoint) = .empty;
- errdefer for (parsed.items) |point| point._proto.releaseRef(frame._page);
+ errdefer for (parsed.items) |point| point._proto.releaseRef(frame.page);
while (try scanner.next()) |x| {
// A trailing coordinate with no pair truncates the list; only a
// malformed number invalidates the whole attribute.
const y = (try scanner.next()) orelse break;
- const point = try DOMPoint.create(x, y, 0, 1, frame._page);
+ const point = try DOMPoint.create(x, y, 0, 1, frame.page);
point._proto.acquireRef();
parsed.append(frame.local_arena, point) catch |err| {
- point._proto.releaseRef(frame._page);
+ point._proto.releaseRef(frame.page);
return err;
};
}
diff --git a/src/browser/webapi/svg/StringList.zig b/src/browser/webapi/svg/StringList.zig
index 7856a7696..7dd44d2f1 100644
--- a/src/browser/webapi/svg/StringList.zig
+++ b/src/browser/webapi/svg/StringList.zig
@@ -68,9 +68,10 @@ pub fn getOrCreate(element: *Element, kind: Kind, frame: *Frame) !*StringList {
.element = element,
.kind = kind,
};
- const gop = try frame._svg_string_lists.getOrPut(frame.arena, key);
+ const page = frame.page;
+ const gop = try page._svg_string_lists.getOrPut(page.frame_arena, key);
if (!gop.found_existing) {
- errdefer _ = frame._svg_string_lists.remove(key);
+ errdefer _ = page._svg_string_lists.remove(key);
gop.value_ptr.* = try frame._factory.create(StringList{
._element = element,
._attribute_name = kind.attributeName(),
diff --git a/src/browser/webapi/svg/Transform.zig b/src/browser/webapi/svg/Transform.zig
index d36cde4c8..959279b2d 100644
--- a/src/browser/webapi/svg/Transform.zig
+++ b/src/browser/webapi/svg/Transform.zig
@@ -79,8 +79,8 @@ pub fn releaseRef(self: *Transform, page: *Page) void {
}
pub fn detached(frame: *Frame) !*Transform {
- const matrix = try DOMMatrix.create(RO.identity(), true, frame._page);
- errdefer matrix._proto.deinit(frame._page);
+ const matrix = try DOMMatrix.create(RO.identity(), true, frame.page);
+ errdefer matrix._proto.deinit(frame.page);
const self = try matrix._proto._arena.create(Transform);
self.* = .{ ._matrix = matrix };
self.attachMatrix();
@@ -89,8 +89,8 @@ pub fn detached(frame: *Frame) !*Transform {
pub fn fromMatrix(init: ?DOMMatrix2DInit, frame: *Frame) !*Transform {
const parsed = try fixup2D(init orelse .{});
- const matrix = try DOMMatrix.create(parsed.m, true, frame._page);
- errdefer matrix._proto.deinit(frame._page);
+ const matrix = try DOMMatrix.create(parsed.m, true, frame.page);
+ errdefer matrix._proto.deinit(frame.page);
const self = try matrix._proto._arena.create(Transform);
self.* = .{ ._matrix = matrix };
self.attachMatrix();
@@ -107,8 +107,8 @@ pub fn fromParsed(parsed: RO.ParsedTransform, frame: *Frame) !*Transform {
.skew_y => 6,
else => return error.SyntaxError,
};
- const matrix = try DOMMatrix.create(parsed.matrix, parsed.is_2d, frame._page);
- errdefer matrix._proto.deinit(frame._page);
+ const matrix = try DOMMatrix.create(parsed.matrix, parsed.is_2d, frame.page);
+ errdefer matrix._proto.deinit(frame.page);
const self = try matrix._proto._arena.create(Transform);
self.* = .{
._type = typ,
@@ -123,8 +123,8 @@ pub fn fromParsed(parsed: RO.ParsedTransform, frame: *Frame) !*Transform {
pub fn clone(self: *const Transform, frame: *Frame) !*Transform {
const current = self.getState();
- const matrix = try DOMMatrix.create(current.matrix, current.is_2d, frame._page);
- errdefer matrix._proto.deinit(frame._page);
+ const matrix = try DOMMatrix.create(current.matrix, current.is_2d, frame.page);
+ errdefer matrix._proto.deinit(frame.page);
const cloned = try matrix._proto._arena.create(Transform);
cloned.* = .{
._type = current.typ,
diff --git a/src/browser/webapi/svg/TransformList.zig b/src/browser/webapi/svg/TransformList.zig
index f9f3135b3..c920eeae9 100644
--- a/src/browser/webapi/svg/TransformList.zig
+++ b/src/browser/webapi/svg/TransformList.zig
@@ -91,7 +91,7 @@ fn consolidate(self: *TransformList, frame: *Frame) !?*Transform {
.is_2d = true,
}, frame);
consolidated.acquireRef();
- errdefer consolidated.releaseRef(frame._page);
+ errdefer consolidated.releaseRef(frame.page);
try M.retireAll(self, frame);
try self._items.ensureTotalCapacity(frame.arena, 1);
@@ -143,7 +143,7 @@ fn mutateTransform(context: *anyopaque, transform: *Transform, state: Transform.
fn parse(raw: []const u8, frame: *Frame) !std.ArrayList(*Transform) {
var parsed: std.ArrayList(*Transform) = .empty;
- errdefer for (parsed.items) |transform| transform.releaseRef(frame._page);
+ errdefer for (parsed.items) |transform| transform.releaseRef(frame.page);
const trimmed = std.mem.trim(u8, raw, " \t\r\n");
if (trimmed.len == 0 or std.mem.eql(u8, trimmed, "none")) return parsed;
@@ -153,7 +153,7 @@ fn parse(raw: []const u8, frame: *Frame) !std.ArrayList(*Transform) {
const transform = try Transform.fromParsed(value, frame);
transform.acquireRef();
parsed.append(frame.local_arena, transform) catch |err| {
- transform.releaseRef(frame._page);
+ transform.releaseRef(frame.page);
return err;
};
}
diff --git a/src/browser/webapi/svg/reflected_list.zig b/src/browser/webapi/svg/reflected_list.zig
index 65a1c0e90..4cd012ce9 100644
--- a/src/browser/webapi/svg/reflected_list.zig
+++ b/src/browser/webapi/svg/reflected_list.zig
@@ -77,7 +77,7 @@ pub fn Mixin(comptime List: type, comptime Item: type, comptime hooks: anytype)
try sync(self, frame);
const prepared = try hooks.prepareItem(self, item, frame);
- errdefer hooks.releaseItem(prepared, frame._page);
+ errdefer hooks.releaseItem(prepared, frame.page);
try retireAll(self, frame);
try self._items.ensureTotalCapacity(frame.arena, 1);
@@ -98,7 +98,7 @@ pub fn Mixin(comptime List: type, comptime Item: type, comptime hooks: anytype)
try sync(self, frame);
const prepared = try hooks.prepareItem(self, item, frame);
- errdefer hooks.releaseItem(prepared, frame._page);
+ errdefer hooks.releaseItem(prepared, frame.page);
const at = @min(@as(usize, index), self._items.items.len);
const next = try frame.local_arena.alloc(*Item, self._items.items.len + 1);
@memcpy(next[0..at], self._items.items[0..at]);
@@ -118,7 +118,7 @@ pub fn Mixin(comptime List: type, comptime Item: type, comptime hooks: anytype)
if (index >= self._items.items.len) return error.IndexSizeError;
const prepared = try hooks.prepareItem(self, item, frame);
- errdefer hooks.releaseItem(prepared, frame._page);
+ errdefer hooks.releaseItem(prepared, frame.page);
const next = try frame.local_arena.dupe(*Item, self._items.items);
next[index] = prepared;
@@ -158,7 +158,7 @@ pub fn Mixin(comptime List: type, comptime Item: type, comptime hooks: anytype)
}
pub fn sync(self: *List, frame: *Frame) !void {
- releaseRetired(self, frame._page);
+ releaseRetired(self, frame.page);
const raw = self._element.getAttributeSafe(hooks.attrName(self)) orelse "";
if (self._synced and std.mem.eql(u8, self._snapshot.items, raw)) {
@@ -170,7 +170,7 @@ pub fn Mixin(comptime List: type, comptime Item: type, comptime hooks: anytype)
error.SyntaxError => std.ArrayList(*Item).empty,
else => return err,
};
- errdefer for (parsed.items) |item| hooks.releaseItem(item, frame._page);
+ errdefer for (parsed.items) |item| hooks.releaseItem(item, frame.page);
self._snapshot.clearRetainingCapacity();
try self._snapshot.appendSlice(frame.arena, raw);
diff --git a/src/browser/xpath/Evaluator.zig b/src/browser/xpath/Evaluator.zig
index cc365688e..597f8a194 100644
--- a/src/browser/xpath/Evaluator.zig
+++ b/src/browser/xpath/Evaluator.zig
@@ -530,7 +530,7 @@ fn appendPreceding(self: *Evaluator, start: *Node, out: *std.ArrayList(*Node)) E
fn appendAttributes(self: *Evaluator, node: *Node, out: *std.ArrayList(*Node)) Error!void {
const el = node.is(Element) orelse return;
for (el.attributeEntries()) |*entry| {
- // Memoized via frame._attribute_lookup so repeated XPath queries
+ // Memoized via page.attribute_lookup so repeated XPath queries
// (Capybara/Selenium polling) reuse the same *Attribute instead
// of leaking fresh ones into page-lifetime storage on every call.
const attribute = try el._attributes.getOrCreateAttribute(entry, el, self.frame);
diff --git a/src/lightpanda.zig b/src/lightpanda.zig
index 7cb7c9c83..45cef95f8 100644
--- a/src/lightpanda.zig
+++ b/src/lightpanda.zig
@@ -467,7 +467,7 @@ fn prepareBinary(arena: std.mem.Allocator, frame: *Frame, opts: FetchOpts) !Bina
}
fn pngOpts(frame: *Frame) screenshot.Opts {
- return .fromViewport(frame._page.getViewport(), true);
+ return .fromViewport(frame.page.getViewport(), true);
}
fn dumpRoot(frame: *Frame, selector: ?[]const u8) !*Node {
diff --git a/src/server/bidi/browsing_context.zig b/src/server/bidi/browsing_context.zig
index 0741770d3..2bbb0facb 100644
--- a/src/server/bidi/browsing_context.zig
+++ b/src/server/bidi/browsing_context.zig
@@ -341,7 +341,7 @@ fn locateNodes(cmd: *const BiDi.Command) !void {
const list = Selector.querySelectorAll(root, selector, frame) catch |err| {
return invalidSelector(cmd, "css", selector, err);
};
- defer list.deinit(frame._page);
+ defer list.deinit(frame.page);
try appendNodes(&remotes, arena, &serializer, list._nodes, max);
}
},
diff --git a/src/server/cdp/Node.zig b/src/server/cdp/Node.zig
index b53201ad5..fc45ad5fb 100644
--- a/src/server/cdp/Node.zig
+++ b/src/server/cdp/Node.zig
@@ -295,7 +295,7 @@ test "cdp Node: search list" {
{
const l1 = try doc.querySelectorAll(.wrap("a"), frame);
- defer l1.deinit(frame._page);
+ defer l1.deinit(frame.page);
const s1 = try search_list.create(l1._nodes);
try testing.expectEqual("1", s1.name);
try testing.expectEqualSlices(u32, &.{ 1, 2 }, s1.node_ids);
@@ -306,7 +306,7 @@ test "cdp Node: search list" {
{
const l2 = try doc.querySelectorAll(.wrap("#a1"), frame);
- defer l2.deinit(frame._page);
+ defer l2.deinit(frame.page);
const s2 = try search_list.create(l2._nodes);
try testing.expectEqual("2", s2.name);
try testing.expectEqualSlices(u32, &.{1}, s2.node_ids);
@@ -314,7 +314,7 @@ test "cdp Node: search list" {
{
const l3 = try doc.querySelectorAll(.wrap("#a2"), frame);
- defer l3.deinit(frame._page);
+ defer l3.deinit(frame.page);
const s3 = try search_list.create(l3._nodes);
try testing.expectEqual("3", s3.name);
try testing.expectEqualSlices(u32, &.{2}, s3.node_ids);
diff --git a/src/server/cdp/domains/dom.zig b/src/server/cdp/domains/dom.zig
index 25c0fbd8f..0861216ec 100644
--- a/src/server/cdp/domains/dom.zig
+++ b/src/server/cdp/domains/dom.zig
@@ -171,7 +171,7 @@ fn performSearch(cmd: *CDP.Command) !void {
}
const list = try Selector.querySelectorAll(root, params.query, frame);
- defer list.deinit(frame._page);
+ defer list.deinit(frame.page);
return finishSearch(cmd, bc, list._nodes);
}
@@ -320,7 +320,7 @@ fn querySelectorAll(cmd: *CDP.Command) !void {
};
const selected_nodes = try Selector.querySelectorAll(node.dom, params.selector, frame);
- defer selected_nodes.deinit(frame._page);
+ defer selected_nodes.deinit(frame.page);
const nodes = selected_nodes._nodes;
@@ -673,9 +673,9 @@ fn setFileInputFiles(cmd: *CDP.Command) !void {
// Files are created at refcount 0; selectFiles takes ownership. If a later
// path fails to load, release the arenas of the ones already created.
var created: usize = 0;
- errdefer for (files[0..created]) |f| f._proto.deinit(frame._page);
+ errdefer for (files[0..created]) |f| f._proto.deinit(frame.page);
for (params.files, 0..) |path, i| {
- files[i] = try fileFromDiskPath(path, frame._page);
+ files[i] = try fileFromDiskPath(path, frame.page);
created = i + 1;
}
}