Skip to content

Lightpanda: the headless browser designed for AI and automation

Optimize collections; Fix unsafe Frame reference

Karl Seguine4b6b3298d1d
diff --git a/src/browser/Frame.zig b/src/browser/Frame.zig
index 477081bd0..55ccb10f0 100644
--- a/src/browser/Frame.zig
+++ b/src/browser/Frame.zig
@@ -42,9 +42,6 @@ const Event = @import("webapi/Event.zig");
const EventTarget = @import("webapi/EventTarget.zig");
const Element = @import("webapi/Element.zig");
const HtmlElement = @import("webapi/element/Html.zig");
-const AnimatedLength = @import("webapi/svg/AnimatedLength.zig");
-const AnimatedPreserveAspectRatio = @import("webapi/svg/AnimatedPreserveAspectRatio.zig");
-const AnimatedString = @import("webapi/svg/AnimatedString.zig");
const Window = @import("webapi/Window.zig");
const Location = @import("webapi/Location.zig");
const Document = @import("webapi/Document.zig");
@@ -65,8 +62,15 @@ const popover = @import("webapi/element/popover.zig");
const slotting = @import("webapi/element/slotting.zig");
const NavigationKind = @import("webapi/navigation/root.zig").NavigationKind;
-const HttpClient = @import("../network/HttpClient.zig");
+const PointList = @import("webapi/svg/PointList.zig");
+const StringList = @import("webapi/svg/StringList.zig");
+const AnimatedLength = @import("webapi/svg/AnimatedLength.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 timestamp = @import("../datetime.zig").timestamp;
const milliTimestamp = @import("../datetime.zig").milliTimestamp;
@@ -89,11 +93,6 @@ pub const BUF_SIZE = 1024;
const Frame = @This();
-pub const SvgCollectionCleanup = struct {
- context: *anyopaque,
- callback: *const fn (*anyopaque, *Page) void,
-};
-
// This is the "id" of the frame. It can be re-used from frame-to-frame, e.g.
// when navigating.
_frame_id: u32,
@@ -153,7 +152,9 @@ _element_namespace_uris: Element.NamespaceUriLookup = .empty,
_svg_animated_lengths: AnimatedLength.Lookup = .empty,
_svg_animated_preserve_aspect_ratios: AnimatedPreserveAspectRatio.Lookup = .empty,
_svg_animated_strings: AnimatedString.Lookup = .empty,
-_svg_collection_cleanups: std.ArrayList(SvgCollectionCleanup) = .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)
@@ -509,10 +510,15 @@ pub fn deinit(self: *Frame) void {
observers.deinit(self, page);
- for (self._svg_collection_cleanups.items) |cleanup| {
- cleanup.callback(cleanup.context, 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);
}
- self._svg_collection_cleanups = .empty;
var document = self.window._document;
document._selection.releaseRef(page);
@@ -546,10 +552,6 @@ pub fn deinit(self: *Frame) void {
page.releaseArena(self.local_arena);
}
-pub fn registerSvgCollectionCleanup(self: *Frame, cleanup: SvgCollectionCleanup) !void {
- try self._svg_collection_cleanups.append(self.arena, cleanup);
-}
-
pub fn trackWorker(self: *Frame, worker: *Worker) !void {
try self.workers.append(self.arena, worker);
}
diff --git a/src/browser/tests/worker/api-worker.js b/src/browser/tests/worker/api-worker.js
index 1f75d7e1c..803b8ace1 100644
--- a/src/browser/tests/worker/api-worker.js
+++ b/src/browser/tests/worker/api-worker.js
@@ -59,6 +59,11 @@
const loc_pathname = loc.pathname;
const loc_to_string = String(loc);
+ // DOMPoint mutation (setters must not require a Frame in a worker)
+ const point = new DOMPoint(1, 2);
+ point.x = 5;
+ point.w = 0.5;
+
postMessage({
ok: true,
results: {
@@ -90,6 +95,8 @@
loc_protocol,
loc_pathname,
loc_to_string,
+ point_x: point.x,
+ point_w: point.w,
},
});
} catch (e) {
diff --git a/src/browser/tests/worker/worker.html b/src/browser/tests/worker/worker.html
index cd3512535..2b953aff1 100644
--- a/src/browser/tests/worker/worker.html
+++ b/src/browser/tests/worker/worker.html
@@ -247,6 +247,10 @@
testing.expectEqual(r.loc_href, r.loc_to_string);
testing.expectEqual('http:', r.loc_protocol);
testing.expectTrue(r.loc_pathname.endsWith('api-worker.js'));
+
+ // DOMPoint
+ testing.expectEqual(5, r.point_x);
+ testing.expectEqual(0.5, r.point_w);
});
}
</script>
diff --git a/src/browser/webapi/DOMPoint.zig b/src/browser/webapi/DOMPoint.zig
index 753b28811..d9356d3f2 100644
--- a/src/browser/webapi/DOMPoint.zig
+++ b/src/browser/webapi/DOMPoint.zig
@@ -17,7 +17,6 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.
const js = @import("../js/js.zig");
-const Frame = @import("../Frame.zig");
const Page = @import("../Page.zig");
const RO = @import("DOMPointReadOnly.zig");
@@ -78,17 +77,17 @@ pub fn getW(self: *const DOMPoint) f64 {
return self._proto._w;
}
-pub fn setX(self: *DOMPoint, v: f64, frame: *Frame) !void {
- try self._proto.setCoordinate(.x, v, frame);
+pub fn setX(self: *DOMPoint, v: f64) !void {
+ try self._proto.setCoordinate(.x, v);
}
-pub fn setY(self: *DOMPoint, v: f64, frame: *Frame) !void {
- try self._proto.setCoordinate(.y, v, frame);
+pub fn setY(self: *DOMPoint, v: f64) !void {
+ try self._proto.setCoordinate(.y, v);
}
-pub fn setZ(self: *DOMPoint, v: f64, frame: *Frame) !void {
- try self._proto.setCoordinate(.z, v, frame);
+pub fn setZ(self: *DOMPoint, v: f64) !void {
+ try self._proto.setCoordinate(.z, v);
}
-pub fn setW(self: *DOMPoint, v: f64, frame: *Frame) !void {
- try self._proto.setCoordinate(.w, v, frame);
+pub fn setW(self: *DOMPoint, v: f64) !void {
+ try self._proto.setCoordinate(.w, v);
}
pub const JsApi = struct {
diff --git a/src/browser/webapi/DOMPointReadOnly.zig b/src/browser/webapi/DOMPointReadOnly.zig
index 2a349650e..525d0c662 100644
--- a/src/browser/webapi/DOMPointReadOnly.zig
+++ b/src/browser/webapi/DOMPointReadOnly.zig
@@ -20,7 +20,6 @@ const std = @import("std");
const lp = @import("lightpanda");
const js = @import("../js/js.zig");
-const Frame = @import("../Frame.zig");
const Page = @import("../Page.zig");
const DOMPoint = @import("DOMPoint.zig");
const Matrix = @import("DOMMatrixReadOnly.zig");
@@ -46,7 +45,7 @@ pub const Coordinate = enum { x, y, z, w };
pub const Attachment = struct {
owner: *anyopaque,
read_only: bool,
- mutate: *const fn (*anyopaque, *DOMPointReadOnly, Coordinate, f64, *Frame) anyerror!void,
+ mutate: *const fn (*anyopaque, *DOMPointReadOnly, Coordinate, f64) anyerror!void,
};
pub const Type = union(enum) {
@@ -142,10 +141,10 @@ pub fn getW(self: *const DOMPointReadOnly) f64 {
return self._w;
}
-pub fn setCoordinate(self: *DOMPointReadOnly, coordinate: Coordinate, value: f64, frame: *Frame) !void {
+pub fn setCoordinate(self: *DOMPointReadOnly, coordinate: Coordinate, value: f64) !void {
if (self._attachment) |attachment| {
if (attachment.read_only) return error.NoModificationAllowed;
- return attachment.mutate(attachment.owner, self, coordinate, value, frame);
+ return attachment.mutate(attachment.owner, self, coordinate, value);
}
self.setCoordinateRaw(coordinate, value);
}
diff --git a/src/browser/webapi/element/svg/Graphics.zig b/src/browser/webapi/element/svg/Graphics.zig
index cb9c27502..93d10c762 100644
--- a/src/browser/webapi/element/svg/Graphics.zig
+++ b/src/browser/webapi/element/svg/Graphics.zig
@@ -35,9 +35,6 @@ pub const Geometry = @import("Geometry.zig");
const Graphics = @This();
_proto: *SvgElement,
_type: Type,
-_transform: ?*AnimatedTransformList = null,
-_required_extensions: ?*StringList = null,
-_system_language: ?*StringList = null,
pub const Type = union(enum) {
svg: *Svg,
@@ -85,32 +82,13 @@ pub const JsApi = struct {
};
pub fn getTransform(self: *Graphics, frame: *Frame) !*AnimatedTransformList {
- if (self._transform == null) {
- self._transform = try AnimatedTransformList.create(self.asElement(), frame);
- }
- return self._transform.?;
+ return AnimatedTransformList.getOrCreate(self.asElement(), frame);
}
pub fn getRequiredExtensions(self: *Graphics, frame: *Frame) !*StringList {
- if (self._required_extensions == null) {
- self._required_extensions = try StringList.create(
- self.asElement(),
- .wrap("requiredExtensions"),
- .whitespace,
- frame,
- );
- }
- return self._required_extensions.?;
+ return StringList.getOrCreate(self.asElement(), .required_extensions, frame);
}
pub fn getSystemLanguage(self: *Graphics, frame: *Frame) !*StringList {
- if (self._system_language == null) {
- self._system_language = try StringList.create(
- self.asElement(),
- .wrap("systemLanguage"),
- .comma,
- frame,
- );
- }
- return self._system_language.?;
+ return StringList.getOrCreate(self.asElement(), .system_language, frame);
}
diff --git a/src/browser/webapi/element/svg/Polygon.zig b/src/browser/webapi/element/svg/Polygon.zig
index b81b2939c..9d55797e4 100644
--- a/src/browser/webapi/element/svg/Polygon.zig
+++ b/src/browser/webapi/element/svg/Polygon.zig
@@ -27,8 +27,6 @@ const PointList = @import("../../svg/PointList.zig");
const Polygon = @This();
_proto: *Geometry,
-_points: ?*PointList = null,
-_animated_points: ?*PointList = null,
pub fn asElement(self: *Polygon) *Element {
return self._proto.asElement();
@@ -51,15 +49,9 @@ pub const JsApi = struct {
};
pub fn getPoints(self: *Polygon, frame: *Frame) !*PointList {
- if (self._points == null) {
- self._points = try PointList.create(self.asElement(), false, frame);
- }
- return self._points.?;
+ return PointList.getOrCreate(self.asElement(), .base, frame);
}
pub fn getAnimatedPoints(self: *Polygon, frame: *Frame) !*PointList {
- if (self._animated_points == null) {
- self._animated_points = try PointList.create(self.asElement(), true, frame);
- }
- return self._animated_points.?;
+ return PointList.getOrCreate(self.asElement(), .animated, frame);
}
diff --git a/src/browser/webapi/element/svg/Polyline.zig b/src/browser/webapi/element/svg/Polyline.zig
index 7e1b3b19f..6ac253167 100644
--- a/src/browser/webapi/element/svg/Polyline.zig
+++ b/src/browser/webapi/element/svg/Polyline.zig
@@ -27,8 +27,6 @@ const PointList = @import("../../svg/PointList.zig");
const Polyline = @This();
_proto: *Geometry,
-_points: ?*PointList = null,
-_animated_points: ?*PointList = null,
pub fn asElement(self: *Polyline) *Element {
return self._proto.asElement();
@@ -51,15 +49,9 @@ pub const JsApi = struct {
};
pub fn getPoints(self: *Polyline, frame: *Frame) !*PointList {
- if (self._points == null) {
- self._points = try PointList.create(self.asElement(), false, frame);
- }
- return self._points.?;
+ return PointList.getOrCreate(self.asElement(), .base, frame);
}
pub fn getAnimatedPoints(self: *Polyline, frame: *Frame) !*PointList {
- if (self._animated_points == null) {
- self._animated_points = try PointList.create(self.asElement(), true, frame);
- }
- return self._animated_points.?;
+ return PointList.getOrCreate(self.asElement(), .animated, frame);
}
diff --git a/src/browser/webapi/svg/AnimatedTransformList.zig b/src/browser/webapi/svg/AnimatedTransformList.zig
index 8c62b1d12..0ec5670f6 100644
--- a/src/browser/webapi/svg/AnimatedTransformList.zig
+++ b/src/browser/webapi/svg/AnimatedTransformList.zig
@@ -5,8 +5,11 @@
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
+const std = @import("std");
+
const js = @import("../../js/js.zig");
const Frame = @import("../../Frame.zig");
+const Page = @import("../../Page.zig");
const Element = @import("../Element.zig");
const TransformList = @import("TransformList.zig");
@@ -15,6 +18,17 @@ const AnimatedTransformList = @This();
_base_val: *TransformList,
_anim_val: *TransformList,
+pub const Lookup = std.AutoHashMapUnmanaged(*Element, *AnimatedTransformList);
+
+pub fn getOrCreate(element: *Element, frame: *Frame) !*AnimatedTransformList {
+ const gop = try frame._svg_animated_transform_lists.getOrPut(frame.arena, element);
+ if (!gop.found_existing) {
+ errdefer _ = frame._svg_animated_transform_lists.remove(element);
+ gop.value_ptr.* = try create(element, frame);
+ }
+ return gop.value_ptr.*;
+}
+
pub fn create(element: *Element, frame: *Frame) !*AnimatedTransformList {
const base_val = try TransformList.create(element, false, frame);
const anim_val = try TransformList.create(element, true, frame);
@@ -24,6 +38,11 @@ pub fn create(element: *Element, frame: *Frame) !*AnimatedTransformList {
});
}
+pub fn deinit(self: *AnimatedTransformList, page: *Page) void {
+ self._base_val.deinit(page);
+ self._anim_val.deinit(page);
+}
+
pub fn getBaseVal(self: *AnimatedTransformList) *TransformList {
return self._base_val;
}
diff --git a/src/browser/webapi/svg/PointList.zig b/src/browser/webapi/svg/PointList.zig
index 2fef4c8f5..558a04c89 100644
--- a/src/browser/webapi/svg/PointList.zig
+++ b/src/browser/webapi/svg/PointList.zig
@@ -17,35 +17,47 @@ const Element = @import("../Element.zig");
const PointList = @This();
+_frame: *Frame,
_element: *Element,
_read_only: bool,
+_synced: bool = false,
+_snapshot: std.ArrayList(u8) = .empty,
_items: std.ArrayList(*DOMPoint) = .empty,
_retired: std.ArrayList(*DOMPoint) = .empty,
-_snapshot: ?[]const u8 = null,
-pub fn create(element: *Element, read_only: bool, frame: *Frame) !*PointList {
- const self = try frame._factory.create(PointList{
- ._element = element,
- ._read_only = read_only,
- });
- try frame.registerSvgCollectionCleanup(.{
- .context = self,
- .callback = PointList.cleanup,
- });
- return self;
+pub const Kind = enum { base, animated };
+
+pub const Key = struct {
+ element: *Element,
+ kind: Kind,
+};
+
+pub const Lookup = std.AutoHashMapUnmanaged(Key, *PointList);
+
+pub fn getOrCreate(element: *Element, kind: Kind, frame: *Frame) !*PointList {
+ const key: Key = .{
+ .element = element,
+ .kind = kind,
+ };
+ const gop = try frame._svg_point_lists.getOrPut(frame.arena, key);
+ if (!gop.found_existing) {
+ errdefer _ = frame._svg_point_lists.remove(key);
+ gop.value_ptr.* = try frame._factory.create(PointList{
+ ._frame = frame,
+ ._element = element,
+ ._read_only = kind == .animated,
+ });
+ }
+ return gop.value_ptr.*;
}
-fn cleanup(context: *anyopaque, page: *Page) void {
- const self: *PointList = @ptrCast(@alignCast(context));
+pub fn deinit(self: *PointList, page: *Page) void {
for (self._items.items) |point| {
point._proto.detach(self);
point._proto.releaseRef(page);
}
- for (self._retired.items) |point| {
- point._proto.releaseRef(page);
- }
self._items.clearRetainingCapacity();
- self._retired.clearRetainingCapacity();
+ self.releaseRetired(page);
}
pub fn getLength(self: *PointList, frame: *Frame) !u32 {
@@ -60,9 +72,8 @@ pub fn getNumberOfItems(self: *PointList, frame: *Frame) !u32 {
pub fn clear(self: *PointList, frame: *Frame) !void {
try self.requireMutable();
try self.sync(frame);
- try self._retired.ensureUnusedCapacity(frame.arena, self._items.items.len);
+ try self.retireAll(frame);
try self.setAttribute(&.{}, frame);
- self.retireAllAssumeCapacity();
}
pub fn initialize(self: *PointList, item: *DOMPoint, frame: *Frame) !*DOMPoint {
@@ -72,10 +83,9 @@ pub fn initialize(self: *PointList, item: *DOMPoint, frame: *Frame) !*DOMPoint {
const prepared = try self.prepareItem(item, frame);
errdefer prepared._proto.releaseRef(frame._page);
+ try self.retireAll(frame);
try self._items.ensureTotalCapacity(frame.arena, 1);
- try self._retired.ensureUnusedCapacity(frame.arena, self._items.items.len);
try self.setAttribute(&.{prepared}, frame);
- self.retireAllAssumeCapacity();
self._items.appendAssumeCapacity(prepared);
self.attach(prepared);
return prepared;
@@ -174,9 +184,9 @@ fn mutatePoint(
point: *DOMPointReadOnly,
coordinate: DOMPointReadOnly.Coordinate,
value: f64,
- frame: *Frame,
) anyerror!void {
const self: *PointList = @ptrCast(@alignCast(context));
+ const frame = self._frame;
try self.sync(frame);
// An external attribute mutation detaches the old item during sync. The
@@ -201,27 +211,40 @@ fn mutatePoint(
}
fn sync(self: *PointList, frame: *Frame) !void {
+ self.releaseRetired(frame._page);
+
const raw = self._element.getAttributeSafe(comptime .wrap("points")) orelse "";
- if (self._snapshot) |snapshot| {
- if (std.mem.eql(u8, snapshot, raw)) return;
+ if (self._synced and std.mem.eql(u8, self._snapshot.items, raw)) {
+ return;
}
- const snapshot = try frame.arena.dupe(u8, raw);
+ self._synced = false;
var parsed = parse(raw, frame) catch |err| switch (err) {
error.SyntaxError => std.ArrayList(*DOMPoint).empty,
else => return err,
};
errdefer for (parsed.items) |point| point._proto.releaseRef(frame._page);
+ self._snapshot.clearRetainingCapacity();
+ try self._snapshot.appendSlice(frame.arena, raw);
+ try self.retireAll(frame);
try self._items.ensureTotalCapacity(frame.arena, parsed.items.len);
- try self._retired.ensureUnusedCapacity(frame.arena, self._items.items.len);
- self.retireAllAssumeCapacity();
for (parsed.items) |point| {
self._items.appendAssumeCapacity(point);
self.attach(point);
}
parsed.clearRetainingCapacity();
- self._snapshot = snapshot;
+ self._synced = true;
+}
+
+// A retired item must outlive the operation that retired it: removeItem's
+// return value has no JS wrapper until the bridge wraps it after we return.
+// By the next operation, anything still reachable holds its own ref.
+fn releaseRetired(self: *PointList, page: *Page) void {
+ for (self._retired.items) |point| {
+ point._proto.releaseRef(page);
+ }
+ self._retired.clearRetainingCapacity();
}
fn parse(raw: []const u8, frame: *Frame) !std.ArrayList(*DOMPoint) {
@@ -241,7 +264,9 @@ fn parse(raw: []const u8, frame: *Frame) !std.ArrayList(*DOMPoint) {
return parsed;
}
-fn retireAllAssumeCapacity(self: *PointList) void {
+fn retireAll(self: *PointList, frame: *Frame) !void {
+ self._synced = false;
+ try self._retired.ensureUnusedCapacity(frame.arena, self._items.items.len);
for (self._items.items) |point| {
point._proto.detach(self);
self._retired.appendAssumeCapacity(point);
@@ -278,9 +303,11 @@ fn setAttributeWithOverride(
}
fn commitAttribute(self: *PointList, serialized: []const u8, frame: *Frame) !void {
- const snapshot = try frame.arena.dupe(u8, serialized);
+ self._synced = false;
try self._element.setAttributeSafe(comptime .wrap("points"), .wrap(serialized), frame);
- self._snapshot = snapshot;
+ self._snapshot.clearRetainingCapacity();
+ try self._snapshot.appendSlice(frame.arena, serialized);
+ self._synced = true;
}
const NumberScanner = struct {
diff --git a/src/browser/webapi/svg/StringList.zig b/src/browser/webapi/svg/StringList.zig
index 8c866209b..56a3a10be 100644
--- a/src/browser/webapi/svg/StringList.zig
+++ b/src/browser/webapi/svg/StringList.zig
@@ -19,15 +19,51 @@ pub const Delimiter = enum { whitespace, comma };
_element: *Element,
_attribute_name: lp.String,
_delimiter: Delimiter,
+_synced: bool = false,
+_snapshot: std.ArrayList(u8) = .empty,
_items: std.ArrayList([]const u8) = .empty,
-_snapshot: ?[]const u8 = null,
-
-pub fn create(element: *Element, attribute_name: lp.String, delimiter: Delimiter, frame: *Frame) !*StringList {
- return frame._factory.create(StringList{
- ._element = element,
- ._attribute_name = attribute_name,
- ._delimiter = delimiter,
- });
+
+pub const Kind = enum {
+ required_extensions,
+ system_language,
+
+ fn attributeName(self: Kind) lp.String {
+ return switch (self) {
+ .required_extensions => .wrap("requiredExtensions"),
+ .system_language => .wrap("systemLanguage"),
+ };
+ }
+
+ fn delimiter(self: Kind) Delimiter {
+ return switch (self) {
+ .required_extensions => .whitespace,
+ .system_language => .comma,
+ };
+ }
+};
+
+pub const Key = struct {
+ element: *Element,
+ kind: Kind,
+};
+
+pub const Lookup = std.AutoHashMapUnmanaged(Key, *StringList);
+
+pub fn getOrCreate(element: *Element, kind: Kind, frame: *Frame) !*StringList {
+ const key: Key = .{
+ .element = element,
+ .kind = kind,
+ };
+ const gop = try frame._svg_string_lists.getOrPut(frame.arena, key);
+ if (!gop.found_existing) {
+ errdefer _ = frame._svg_string_lists.remove(key);
+ gop.value_ptr.* = try frame._factory.create(StringList{
+ ._element = element,
+ ._attribute_name = kind.attributeName(),
+ ._delimiter = kind.delimiter(),
+ });
+ }
+ return gop.value_ptr.*;
}
pub fn getLength(self: *StringList, frame: *Frame) !u32 {
@@ -103,18 +139,8 @@ fn validateItem(self: *const StringList, item: []const u8) !void {
fn sync(self: *StringList, frame: *Frame) !void {
const raw = self._element.getAttributeSafe(self._attribute_name) orelse "";
- if (self._snapshot) |snapshot| if (std.mem.eql(u8, snapshot, raw)) return;
-
- const snapshot = try frame.arena.dupe(u8, raw);
- var parsed = parse(snapshot, self._delimiter, frame.local_arena) catch |err| switch (err) {
- error.SyntaxError => std.ArrayList([]const u8).empty,
- else => return err,
- };
- try self._items.ensureTotalCapacity(frame.arena, parsed.items.len);
- self._items.clearRetainingCapacity();
- for (parsed.items) |item| self._items.appendAssumeCapacity(item);
- parsed.clearRetainingCapacity();
- self._snapshot = snapshot;
+ if (self._synced and std.mem.eql(u8, self._snapshot.items, raw)) return;
+ try self.rebuild(raw, frame);
}
fn commit(self: *StringList, items: []const []const u8, frame: *Frame) !void {
@@ -127,14 +153,22 @@ fn commit(self: *StringList, items: []const []const u8, frame: *Frame) !void {
}
const serialized_bytes = serialized.written();
- const snapshot = try frame.arena.dupe(u8, serialized_bytes);
- var parsed = try parse(snapshot, self._delimiter, frame.local_arena);
- try self._items.ensureTotalCapacity(frame.arena, parsed.items.len);
try self._element.setAttributeSafe(self._attribute_name, .wrap(serialized_bytes), frame);
+ try self.rebuild(serialized_bytes, frame);
+}
+
+// `raw` must not alias `_snapshot`; `_items` are slices into `_snapshot`.
+fn rebuild(self: *StringList, raw: []const u8, frame: *Frame) !void {
+ self._synced = false;
+ self._snapshot.clearRetainingCapacity();
+ try self._snapshot.appendSlice(frame.arena, raw);
+ const parsed = parse(self._snapshot.items, self._delimiter, frame.local_arena) catch |err| switch (err) {
+ error.SyntaxError => std.ArrayList([]const u8).empty,
+ else => return err,
+ };
self._items.clearRetainingCapacity();
- for (parsed.items) |item| self._items.appendAssumeCapacity(item);
- parsed.clearRetainingCapacity();
- self._snapshot = snapshot;
+ try self._items.appendSlice(frame.arena, parsed.items);
+ self._synced = true;
}
fn parse(raw: []const u8, delimiter: Delimiter, allocator: std.mem.Allocator) !std.ArrayList([]const u8) {
diff --git a/src/browser/webapi/svg/Transform.zig b/src/browser/webapi/svg/Transform.zig
index 09d6f13a9..a1e427593 100644
--- a/src/browser/webapi/svg/Transform.zig
+++ b/src/browser/webapi/svg/Transform.zig
@@ -60,7 +60,7 @@ pub const State = struct {
pub const Attachment = struct {
owner: *anyopaque,
read_only: bool,
- mutate: *const fn (*anyopaque, *Transform, State, *Frame) anyerror!void,
+ mutate: *const fn (*anyopaque, *Transform, State) anyerror!void,
};
// The transform owns the matrix arena even when no JS wrapper currently
@@ -133,38 +133,38 @@ pub fn getAngle(self: *const Transform) f64 {
return self._angle;
}
-pub fn setMatrix(self: *Transform, init: ?DOMMatrix2DInit, frame: *Frame) !void {
+pub fn setMatrix(self: *Transform, init: ?DOMMatrix2DInit) !void {
const parsed = try fixup2D(init orelse .{});
- try self.applyState(.{ .typ = 1, .angle = 0, .cx = 0, .cy = 0, .matrix = parsed.m, .is_2d = true }, frame);
+ try self.applyState(.{ .typ = 1, .angle = 0, .cx = 0, .cy = 0, .matrix = parsed.m, .is_2d = true });
}
-pub fn setTranslate(self: *Transform, tx: f64, ty: f64, frame: *Frame) !void {
+pub fn setTranslate(self: *Transform, tx: f64, ty: f64) !void {
try ensureFinite(&.{ tx, ty });
- try self.applyState(.{ .typ = 2, .angle = 0, .cx = 0, .cy = 0, .matrix = RO.translationMatrix(tx, ty, 0), .is_2d = true }, frame);
+ try self.applyState(.{ .typ = 2, .angle = 0, .cx = 0, .cy = 0, .matrix = RO.translationMatrix(tx, ty, 0), .is_2d = true });
}
-pub fn setScale(self: *Transform, sx: f64, sy: f64, frame: *Frame) !void {
+pub fn setScale(self: *Transform, sx: f64, sy: f64) !void {
try ensureFinite(&.{ sx, sy });
- try self.applyState(.{ .typ = 3, .angle = 0, .cx = 0, .cy = 0, .matrix = RO.scaleMatrix(sx, sy, 1), .is_2d = true }, frame);
+ try self.applyState(.{ .typ = 3, .angle = 0, .cx = 0, .cy = 0, .matrix = RO.scaleMatrix(sx, sy, 1), .is_2d = true });
}
-pub fn setRotate(self: *Transform, angle: f64, cx: f64, cy: f64, frame: *Frame) !void {
+pub fn setRotate(self: *Transform, angle: f64, cx: f64, cy: f64) !void {
try ensureFinite(&.{ angle, cx, cy });
const radians = angle * std.math.pi / 180.0;
var matrix = RO.translationMatrix(cx, cy, 0);
matrix = RO.multiplyMatrix(matrix, RO.rotateZMatrix(radians));
matrix = RO.multiplyMatrix(matrix, RO.translationMatrix(-cx, -cy, 0));
- try self.applyState(.{ .typ = 4, .angle = angle, .cx = cx, .cy = cy, .matrix = matrix, .is_2d = true }, frame);
+ try self.applyState(.{ .typ = 4, .angle = angle, .cx = cx, .cy = cy, .matrix = matrix, .is_2d = true });
}
-pub fn setSkewX(self: *Transform, angle: f64, frame: *Frame) !void {
+pub fn setSkewX(self: *Transform, angle: f64) !void {
try ensureFinite(&.{angle});
- try self.applyState(.{ .typ = 5, .angle = angle, .cx = 0, .cy = 0, .matrix = RO.skewMatrix(angle * std.math.pi / 180.0, 0), .is_2d = true }, frame);
+ try self.applyState(.{ .typ = 5, .angle = angle, .cx = 0, .cy = 0, .matrix = RO.skewMatrix(angle * std.math.pi / 180.0, 0), .is_2d = true });
}
-pub fn setSkewY(self: *Transform, angle: f64, frame: *Frame) !void {
+pub fn setSkewY(self: *Transform, angle: f64) !void {
try ensureFinite(&.{angle});
- try self.applyState(.{ .typ = 6, .angle = angle, .cx = 0, .cy = 0, .matrix = RO.skewMatrix(0, angle * std.math.pi / 180.0), .is_2d = true }, frame);
+ try self.applyState(.{ .typ = 6, .angle = angle, .cx = 0, .cy = 0, .matrix = RO.skewMatrix(0, angle * std.math.pi / 180.0), .is_2d = true });
}
pub fn getState(self: *const Transform) State {
@@ -187,11 +187,11 @@ pub fn applyStateRaw(self: *Transform, state: State) void {
self._matrix._proto._is_2d = state.is_2d;
}
-fn applyState(self: *Transform, state: State, frame: *Frame) !void {
+fn applyState(self: *Transform, state: State) !void {
try ensureFinite(&state.matrix);
if (self._attachment) |attachment| {
if (attachment.read_only) return error.NoModificationAllowed;
- return attachment.mutate(attachment.owner, self, state, frame);
+ return attachment.mutate(attachment.owner, self, state);
}
self.applyStateRaw(state);
}
diff --git a/src/browser/webapi/svg/TransformList.zig b/src/browser/webapi/svg/TransformList.zig
index 8acc51faa..773b2557b 100644
--- a/src/browser/webapi/svg/TransformList.zig
+++ b/src/browser/webapi/svg/TransformList.zig
@@ -16,33 +16,29 @@ const Transform = @import("Transform.zig");
const TransformList = @This();
-_element: *Element,
+_frame: *Frame,
_read_only: bool,
+_element: *Element,
+_synced: bool = false,
+_snapshot: std.ArrayList(u8) = .empty,
_items: std.ArrayList(*Transform) = .empty,
_retired: std.ArrayList(*Transform) = .empty,
-_snapshot: ?[]const u8 = null,
pub fn create(element: *Element, read_only: bool, frame: *Frame) !*TransformList {
- const self = try frame._factory.create(TransformList{
+ return frame._factory.create(TransformList{
+ ._frame = frame,
._element = element,
._read_only = read_only,
});
- try frame.registerSvgCollectionCleanup(.{
- .context = self,
- .callback = TransformList.cleanup,
- });
- return self;
}
-fn cleanup(context: *anyopaque, page: *Page) void {
- const self: *TransformList = @ptrCast(@alignCast(context));
+pub fn deinit(self: *TransformList, page: *Page) void {
for (self._items.items) |transform| {
transform.detach(self);
transform.releaseRef(page);
}
- for (self._retired.items) |transform| transform.releaseRef(page);
self._items.clearRetainingCapacity();
- self._retired.clearRetainingCapacity();
+ self.releaseRetired(page);
}
pub fn getLength(self: *TransformList, frame: *Frame) !u32 {
@@ -57,9 +53,8 @@ pub fn getNumberOfItems(self: *TransformList, frame: *Frame) !u32 {
pub fn clear(self: *TransformList, frame: *Frame) !void {
try self.requireMutable();
try self.sync(frame);
- try self._retired.ensureUnusedCapacity(frame.arena, self._items.items.len);
+ try self.retireAll(frame);
try self.setAttribute(&.{}, frame);
- self.retireAllAssumeCapacity();
}
pub fn initialize(self: *TransformList, item: *Transform, frame: *Frame) !*Transform {
@@ -68,10 +63,9 @@ pub fn initialize(self: *TransformList, item: *Transform, frame: *Frame) !*Trans
const prepared = try self.prepareItem(item, frame);
errdefer prepared.releaseRef(frame._page);
+ try self.retireAll(frame);
try self._items.ensureTotalCapacity(frame.arena, 1);
- try self._retired.ensureUnusedCapacity(frame.arena, self._items.items.len);
try self.setAttribute(&.{prepared}, frame);
- self.retireAllAssumeCapacity();
self._items.appendAssumeCapacity(prepared);
self.attach(prepared);
return prepared;
@@ -165,10 +159,9 @@ pub fn consolidate(self: *TransformList, frame: *Frame) !?*Transform {
consolidated.acquireRef();
errdefer consolidated.releaseRef(frame._page);
+ try self.retireAll(frame);
try self._items.ensureTotalCapacity(frame.arena, 1);
- try self._retired.ensureUnusedCapacity(frame.arena, self._items.items.len);
try self.setAttribute(&.{consolidated}, frame);
- self.retireAllAssumeCapacity();
self._items.appendAssumeCapacity(consolidated);
self.attach(consolidated);
return consolidated;
@@ -192,8 +185,9 @@ fn attach(self: *TransformList, transform: *Transform) void {
});
}
-fn mutateTransform(context: *anyopaque, transform: *Transform, state: Transform.State, frame: *Frame) anyerror!void {
+fn mutateTransform(context: *anyopaque, transform: *Transform, state: Transform.State) anyerror!void {
const self: *TransformList = @ptrCast(@alignCast(context));
+ const frame = self._frame;
try self.sync(frame);
if (!transform.isAttachedTo(self)) {
transform.applyStateRaw(state);
@@ -207,24 +201,38 @@ fn mutateTransform(context: *anyopaque, transform: *Transform, state: Transform.
}
fn sync(self: *TransformList, frame: *Frame) !void {
+ self.releaseRetired(frame._page);
+
const raw = self._element.getAttributeSafe(comptime .wrap("transform")) orelse "";
- if (self._snapshot) |snapshot| if (std.mem.eql(u8, snapshot, raw)) return;
- const snapshot = try frame.arena.dupe(u8, raw);
+ if (self._synced and std.mem.eql(u8, self._snapshot.items, raw)) return;
+
+ self._synced = false;
var parsed = parse(raw, frame) catch |err| switch (err) {
error.SyntaxError => std.ArrayList(*Transform).empty,
else => return err,
};
errdefer for (parsed.items) |transform| transform.releaseRef(frame._page);
+ self._snapshot.clearRetainingCapacity();
+ try self._snapshot.appendSlice(frame.arena, raw);
+ try self.retireAll(frame);
try self._items.ensureTotalCapacity(frame.arena, parsed.items.len);
- try self._retired.ensureUnusedCapacity(frame.arena, self._items.items.len);
- self.retireAllAssumeCapacity();
for (parsed.items) |transform| {
self._items.appendAssumeCapacity(transform);
self.attach(transform);
}
parsed.clearRetainingCapacity();
- self._snapshot = snapshot;
+ self._synced = true;
+}
+
+// A retired item must outlive the operation that retired it: removeItem's
+// return value has no JS wrapper until the bridge wraps it after we return.
+// By the next operation, anything still reachable holds its own ref.
+fn releaseRetired(self: *TransformList, page: *Page) void {
+ for (self._retired.items) |transform| {
+ transform.releaseRef(page);
+ }
+ self._retired.clearRetainingCapacity();
}
fn parse(raw: []const u8, frame: *Frame) !std.ArrayList(*Transform) {
@@ -246,7 +254,9 @@ fn parse(raw: []const u8, frame: *Frame) !std.ArrayList(*Transform) {
return parsed;
}
-fn retireAllAssumeCapacity(self: *TransformList) void {
+fn retireAll(self: *TransformList, frame: *Frame) !void {
+ self._synced = false;
+ try self._retired.ensureUnusedCapacity(frame.arena, self._items.items.len);
for (self._items.items) |transform| {
transform.detach(self);
self._retired.appendAssumeCapacity(transform);
@@ -275,9 +285,11 @@ fn setAttributeWithOverride(self: *TransformList, index: usize, state: Transform
}
fn commitAttribute(self: *TransformList, serialized: []const u8, frame: *Frame) !void {
- const snapshot = try frame.arena.dupe(u8, serialized);
+ self._synced = false;
try self._element.setAttributeSafe(comptime .wrap("transform"), .wrap(serialized), frame);
- self._snapshot = snapshot;
+ self._snapshot.clearRetainingCapacity();
+ try self._snapshot.appendSlice(frame.arena, serialized);
+ self._synced = true;
}
pub const JsApi = struct {