Skip to content

Lightpanda: the headless browser designed for AI and automation

remove `frame.buf` in favor of `local_arena`

nikneyma70ecd65efc5
diff --git a/src/browser/Frame.zig b/src/browser/Frame.zig
index e6c9226be..c3f51005e 100644
--- a/src/browser/Frame.zig
+++ b/src/browser/Frame.zig
@@ -85,8 +85,6 @@ const String = lp.String;
const IFrame = Element.Html.IFrame;
const Allocator = std.mem.Allocator;
-pub const BUF_SIZE = 1024;
-
const Frame = @This();
// This is the "id" of the frame. It can be re-used from frame-to-frame, e.g.
@@ -258,10 +256,6 @@ inherited_base_url: ?[:0]const u8 = null,
// Document charset (canonical name from encoding_rs, static lifetime)
charset: []const u8 = "UTF-8",
-// Arbitrary buffer. Need to temporarily lowercase a value? Use this. No lifetime
-// guarantee - it's valid until someone else uses it.
-buf: [BUF_SIZE]u8 = undefined,
-
// access to the JavaScript engine
js: *JS.Context,
@@ -2968,7 +2962,7 @@ pub fn appendNew(self: *Frame, parent: *Node, child: *Node, parent_root: ?*Node)
// called from the parser when the node and all its children have been added
pub fn nodeComplete(self: *Frame, node: *Node) !void {
Node.Build.call(node, "complete", .{ node, self }) catch |err| {
- log.err(.bug, "build.complete", .{ .tag = node.getNodeName(&self.buf), .err = err, .type = self._type, .url = self.url });
+ log.err(.bug, "build.complete", .{ .tag = node.getNodeName(self.local_arena), .err = err, .type = self._type, .url = self.url });
return err;
};
return self.nodeIsReady(true, node);
diff --git a/src/browser/frame/node_factory.zig b/src/browser/frame/node_factory.zig
index ddbc33df2..c06d19ad0 100644
--- a/src/browser/frame/node_factory.zig
+++ b/src/browser/frame/node_factory.zig
@@ -946,11 +946,8 @@ pub fn createElementNS(document: *const Node.Document, namespace: Element.Namesp
else => {},
}
- // No known tag name is longer than frame.buf.
- const tag: Element.Tag = if (name.len > frame.buf.len)
- .unknown
- else
- std.meta.stringToEnum(Element.Tag, std.ascii.lowerString(&frame.buf, name)) orelse .unknown;
+ const lower = try std.ascii.allocLowerString(frame.local_arena, name);
+ const tag = std.meta.stringToEnum(Element.Tag, lower) orelse .unknown;
return createSvgElementT(document, Element.Svg.Generic, name, attribute_iterator, .{ ._tag = tag });
},
else => {
@@ -1066,7 +1063,7 @@ fn createHtmlElementT(document: *const Node.Document, comptime E: type, namespac
return node;
}
@call(.auto, @field(E.Build, "created"), .{ node, frame }) catch |err| {
- log.debug(.frame, "build.created", .{ .tag = node.getNodeName(&frame.buf), .err = err, .type = frame._type, .url = frame.url });
+ log.debug(.frame, "build.created", .{ .tag = node.getNodeName(frame.local_arena), .err = err, .type = frame._type, .url = frame.url });
return err;
};
}
@@ -1149,7 +1146,7 @@ fn noteEventHandlerAttributes(element: *Element, frame: *Frame) !void {
// attribute (`xlink:href` in foreign content, `xml:id` in XML) must keep its
// prefix — that is what `getAttribute("xlink:href")` and `Attr.name` see in
// browsers. The joined name only has to outlive putNew, which canonicalizes
-// it into the frame arena. (Not frame.buf: name normalization writes there.)
+// it into the frame arena.
fn parserAttributeName(frame: *Frame, qname: Parser.QualName) ![]const u8 {
const local = qname.local.slice();
const prefix = (qname.prefix.unwrap() orelse return local).slice();
diff --git a/src/browser/js/Env.zig b/src/browser/js/Env.zig
index 72a37ffa6..cafe8ef70 100644
--- a/src/browser/js/Env.zig
+++ b/src/browser/js/Env.zig
@@ -384,7 +384,6 @@ fn _createContext(self: *Env, global: anytype, params: ContextParams) !*Context
context.execution = .{
.js = context,
.url = &global.url,
- .buf = &global.buf,
.charset = &global.charset,
.page_arena = if (comptime is_frame) global.page_arena else global.arena,
.page = context.page,
diff --git a/src/browser/js/Execution.zig b/src/browser/js/Execution.zig
index 73a95a6af..c99250f4e 100644
--- a/src/browser/js/Execution.zig
+++ b/src/browser/js/Execution.zig
@@ -53,7 +53,6 @@ const Execution = @This();
js: *Context,
// Fields named to match Page for generic code (executor._factory works for both)
-buf: []u8,
// For a Frame, the Page's arena. For a worker, the worker's own arena (a worker
// has its own identity map, so nothing it allocates is shared with another realm).
page_arena: Allocator,
diff --git a/src/browser/tests/document/create_element.html b/src/browser/tests/document/create_element.html
index 53ad7c3bb..d3522501b 100644
--- a/src/browser/tests/document/create_element.html
+++ b/src/browser/tests/document/create_element.html
@@ -17,3 +17,14 @@
testing.expectEqual(div1, $('#hello'));
</script>
+
+<script id=longName>
+{
+ // longer than the 1024-byte buffer names used to be case-mapped into
+ const name = 'x-' + 'a'.repeat(2000);
+ const el = document.createElement(name.toUpperCase());
+ testing.expectEqual(name, el.localName);
+ testing.expectEqual(name.toUpperCase(), el.tagName);
+ testing.expectEqual(name.toUpperCase(), el.nodeName);
+}
+</script>
diff --git a/src/browser/tests/element/css_style_properties.html b/src/browser/tests/element/css_style_properties.html
index 61cb8e945..1db799358 100644
--- a/src/browser/tests/element/css_style_properties.html
+++ b/src/browser/tests/element/css_style_properties.html
@@ -220,3 +220,14 @@
testing.expectEqual('teal', c.style.color);
}
</script>
+
+<script id="longPropertyName">
+{
+ // longer than the 1024-byte buffer names used to be lowercased into
+ const div = $('#test-div');
+ const name = 'a'.repeat(2000);
+ testing.expectEqual(undefined, div.style[name]);
+ testing.expectEqual(undefined, div.style[name.toUpperCase()]);
+ testing.expectEqual('', div.style.getPropertyValue(name.toUpperCase()));
+}
+</script>
diff --git a/src/browser/tests/net/headers.html b/src/browser/tests/net/headers.html
index 91cf341ec..8ffda510c 100644
--- a/src/browser/tests/net/headers.html
+++ b/src/browser/tests/net/headers.html
@@ -456,3 +456,14 @@
}
}
</script>
+
+<script id=long_name>
+{
+ // longer than the 1024-byte buffer names used to be lowercased into
+ const name = 'x-' + 'a'.repeat(2000);
+ const headers = new Headers({ [name.toUpperCase()]: '1' });
+ testing.expectEqual('1', headers.get(name));
+ headers.append(name.toUpperCase(), '2');
+ testing.expectEqual('1, 2', headers.get(name));
+}
+</script>
diff --git a/src/browser/webapi/DOMException.zig b/src/browser/webapi/DOMException.zig
index 6babf1efb..36b024452 100644
--- a/src/browser/webapi/DOMException.zig
+++ b/src/browser/webapi/DOMException.zig
@@ -163,7 +163,7 @@ pub fn toString(self: *const DOMException, exec: *js.Execution) ![]const u8 {
else => break :blk self.getMessage(),
}
};
- return std.mem.print(exec.buf, "{s}: {s}", .{ self.getName(), msg }) catch return msg;
+ return exec.local_arena.print("{s}: {s}", .{ self.getName(), msg });
}
pub fn structuredSerialize(self: *const DOMException, writer: *js.StructuredWriter) !void {
diff --git a/src/browser/webapi/Document.zig b/src/browser/webapi/Document.zig
index 691add6b4..0058e5dc9 100644
--- a/src/browser/webapi/Document.zig
+++ b/src/browser/webapi/Document.zig
@@ -359,11 +359,7 @@ pub fn createElement(self: *Document, name: []const u8, options_: ?CreateElement
try validateElementName(name);
const ns: Element.Namespace, const normalized_name = blk: {
if (self._type == .html) {
- const lower = if (name.len <= frame.buf.len)
- std.ascii.lowerString(&frame.buf, name)
- else
- try std.ascii.allocLowerString(frame.local_arena, name);
- break :blk .{ .html, lower };
+ break :blk .{ .html, try std.ascii.allocLowerString(frame.local_arena, name) };
}
// Generic and XML documents create elements with null namespace
break :blk .{ .null, name };
@@ -639,7 +635,7 @@ fn createEvent(_: *const Document, event_type: []const u8, frame: *Frame) !*@imp
if (event_type.len > 100) {
return error.NotSupported;
}
- const normalized = std.ascii.lowerString(&frame.buf, event_type);
+ const normalized = try std.ascii.allocLowerString(frame.local_arena, event_type);
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")) {
diff --git a/src/browser/webapi/Element.zig b/src/browser/webapi/Element.zig
index 42d4bbd8c..a23cc1883 100644
--- a/src/browser/webapi/Element.zig
+++ b/src/browser/webapi/Element.zig
@@ -48,6 +48,7 @@ pub const Reflect = @import("element/reflection.zig").Reflect;
const log = lp.log;
const String = lp.String;
+const Allocator = std.mem.Allocator;
const Element = @This();
@@ -346,7 +347,7 @@ pub fn getTagNameLower(self: *const Element) []const u8 {
}
}
-pub fn getTagNameSpec(self: *const Element, buf: []u8) []const u8 {
+pub fn getTagNameSpec(self: *const Element, allocator: Allocator) []const u8 {
return switch (self._type) {
.html => blk: {
const he = self.subtype(Html);
@@ -358,7 +359,7 @@ pub fn getTagNameSpec(self: *const Element, buf: []u8) []const u8 {
.br => "BR",
.button => "BUTTON",
.canvas => "CANVAS",
- .custom => upperTagName(&he.subtype(Html.Custom)._tag_name, buf),
+ .custom => upperTagName(&he.subtype(Html.Custom)._tag_name, allocator),
.data => "DATA",
.datalist => "DATALIST",
.details => "DETAILS",
@@ -371,8 +372,8 @@ pub fn getTagNameSpec(self: *const Element, buf: []u8) []const u8 {
.font => "FONT",
.frameset => "FRAMESET",
.form => "FORM",
- .generic => upperTagName(&he.subtype(Html.Generic)._tag_name, buf),
- .heading => upperTagName(&he.subtype(Html.Heading)._tag_name, buf),
+ .generic => upperTagName(&he.subtype(Html.Generic)._tag_name, allocator),
+ .heading => upperTagName(&he.subtype(Html.Heading)._tag_name, allocator),
.head => "HEAD",
.html => "HTML",
.hr => "HR",
@@ -392,7 +393,7 @@ pub fn getTagNameSpec(self: *const Element, buf: []u8) []const u8 {
.generic => "MEDIA",
},
.meter => "METER",
- .mod => upperTagName(&he.subtype(Html.Mod)._tag_name, buf),
+ .mod => upperTagName(&he.subtype(Html.Mod)._tag_name, allocator),
.object => "OBJECT",
.ol => "OL",
.optgroup => "OPTGROUP",
@@ -403,7 +404,7 @@ pub fn getTagNameSpec(self: *const Element, buf: []u8) []const u8 {
.param => "PARAM",
.pre => "PRE",
.progress => "PROGRESS",
- .quote => upperTagName(&he.subtype(Html.Quote)._tag_name, buf),
+ .quote => upperTagName(&he.subtype(Html.Quote)._tag_name, allocator),
.script => "SCRIPT",
.select => "SELECT",
.slot => "SLOT",
@@ -412,10 +413,10 @@ pub fn getTagNameSpec(self: *const Element, buf: []u8) []const u8 {
.style => "STYLE",
.table => "TABLE",
.table_caption => "CAPTION",
- .table_cell => upperTagName(&he.subtype(Html.TableCell)._tag_name, buf),
- .table_col => upperTagName(&he.subtype(Html.TableCol)._tag_name, buf),
+ .table_cell => upperTagName(&he.subtype(Html.TableCell)._tag_name, allocator),
+ .table_col => upperTagName(&he.subtype(Html.TableCol)._tag_name, allocator),
.table_row => "TR",
- .table_section => upperTagName(&he.subtype(Html.TableSection)._tag_name, buf),
+ .table_section => upperTagName(&he.subtype(Html.TableSection)._tag_name, allocator),
.template => "TEMPLATE",
.textarea => "TEXTAREA",
.time => "TIME",
@@ -423,7 +424,7 @@ pub fn getTagNameSpec(self: *const Element, buf: []u8) []const u8 {
.track => "TRACK",
.ul => "UL",
.unknown => switch (self._namespace) {
- .html => upperTagName(&he.subtype(Html.Unknown)._tag_name, buf),
+ .html => upperTagName(&he.subtype(Html.Unknown)._tag_name, allocator),
.svg, .xml, .mathml, .unknown, .null => he.subtype(Html.Unknown)._tag_name.str(),
},
};
@@ -2380,13 +2381,14 @@ pub fn format(self: *Element, writer: *std.Io.Writer) !void {
try writer.writeByte('>');
}
-fn upperTagName(tag_name: *String, buf: []u8) []const u8 {
- if (tag_name.len > buf.len) {
- log.info(.dom, "tag.long.name", .{ .name = tag_name.str() });
- return tag_name.str();
- }
+// Falls back to the stored name when the copy can't be allocated, e.g. a long
+// name and a caller's fixed buffer.
+fn upperTagName(tag_name: *String, allocator: Allocator) []const u8 {
const tag = tag_name.str();
- return std.ascii.upperString(buf, tag);
+ return std.ascii.allocUpperString(allocator, tag) catch {
+ log.info(.dom, "tag.long.name", .{ .name = tag });
+ return tag;
+ };
}
pub fn getTag(self: *const Element) Tag {
@@ -2672,7 +2674,7 @@ pub const JsApi = struct {
pub const tagName = bridge.accessor(_tagName, null, .{});
fn _tagName(self: *Element, frame: *Frame) []const u8 {
- return self.getTagNameSpec(&frame.buf);
+ return self.getTagNameSpec(frame.local_arena);
}
// the frame-aware variant returns the original URI for namespaces
// outside the built-in set instead of the placeholder
diff --git a/src/browser/webapi/KeyValueList.zig b/src/browser/webapi/KeyValueList.zig
index b3dd3e4ab..9981dff40 100644
--- a/src/browser/webapi/KeyValueList.zig
+++ b/src/browser/webapi/KeyValueList.zig
@@ -34,7 +34,7 @@ pub fn registerTypes() []const type {
};
}
-const Normalizer = *const fn ([]const u8, []u8) []const u8;
+const Normalizer = *const fn (Allocator, []const u8) Allocator.Error![]const u8;
pub const Entry = struct {
name: String,
@@ -62,7 +62,7 @@ pub fn copy(arena: Allocator, original: KeyValueList) !KeyValueList {
return list;
}
-pub fn fromJsObject(arena: Allocator, js_obj: js.Object, comptime normalizer: ?Normalizer, buf: []u8) !KeyValueList {
+pub fn fromJsObject(arena: Allocator, js_obj: js.Object, comptime normalizer: ?Normalizer, local_arena: Allocator) !KeyValueList {
var it = try js_obj.iterator();
var list = KeyValueList.init();
@@ -70,7 +70,7 @@ pub fn fromJsObject(arena: Allocator, js_obj: js.Object, comptime normalizer: ?N
while (try it.next()) |kv| {
const name = kv.name;
- const normalized = if (comptime normalizer) |n| n(name, buf) else name;
+ const normalized = if (comptime normalizer) |n| try n(local_arena, name) else name;
// Two JS keys can mape to the same string, and in such cases, it's
// an update, not an append.
@@ -99,12 +99,12 @@ fn getEntryPtr(self: *KeyValueList, name: []const u8) ?*Entry {
return null;
}
-pub fn fromArray(arena: Allocator, kvs: []const [2][]const u8, comptime normalizer: ?Normalizer, buf: []u8) !KeyValueList {
+pub fn fromArray(arena: Allocator, kvs: []const [2][]const u8, comptime normalizer: ?Normalizer, local_arena: Allocator) !KeyValueList {
var list = KeyValueList.init();
try list.ensureTotalCapacity(arena, kvs.len);
for (kvs) |pair| {
- const normalized = if (comptime normalizer) |n| n(pair[0], buf) else pair[0];
+ const normalized = if (comptime normalizer) |n| try n(local_arena, pair[0]) else pair[0];
list._entries.appendAssumeCapacity(.{
.name = try String.init(arena, normalized, .{}),
diff --git a/src/browser/webapi/Node.zig b/src/browser/webapi/Node.zig
index 6edb241f5..f22f347b7 100644
--- a/src/browser/webapi/Node.zig
+++ b/src/browser/webapi/Node.zig
@@ -481,9 +481,9 @@ pub fn setTextContent(self: *Node, data: []const u8, frame: *Frame) !void {
}
}
-pub fn getNodeName(self: *const Node, buf: []u8) []const u8 {
+pub fn getNodeName(self: *const Node, allocator: Allocator) []const u8 {
return switch (self._type) {
- .element => self.subtype(Element).getTagNameSpec(buf),
+ .element => self.subtype(Element).getTagNameSpec(allocator),
.cdata => {
const cd = self.subtype(CData);
return switch (cd._type) {
@@ -1422,7 +1422,7 @@ pub fn getElementsByTagName(self: *Node, tag_name: []const u8, frame: *Frame) !G
};
}
- const lower = std.ascii.lowerString(&frame.buf, tag_name);
+ const lower = try std.ascii.allocLowerString(frame.local_arena, tag_name);
if (Node.Element.Tag.parseForMatch(lower)) |known| {
// optimized for known tag names, comparison
return .{
@@ -1816,7 +1816,7 @@ pub const JsApi = struct {
pub const nodeName = bridge.accessor(struct {
fn wrap(self: *const Node, frame: *Frame) []const u8 {
- return self.getNodeName(&frame.buf);
+ return self.getNodeName(frame.local_arena);
}
}.wrap, null, .{});
pub const nodeType = bridge.accessor(Node.getNodeType, null, .{});
diff --git a/src/browser/webapi/SubtleCrypto.zig b/src/browser/webapi/SubtleCrypto.zig
index 99ac92365..be8ee0e46 100644
--- a/src/browser/webapi/SubtleCrypto.zig
+++ b/src/browser/webapi/SubtleCrypto.zig
@@ -845,13 +845,13 @@ pub fn digest(_: *const SubtleCrypto, algo: DigestInput, data: js.TypedArray(u8)
return error.NotSupported;
}
- const normalized = std.ascii.upperString(exec.buf, algo_name);
+ const normalized = try std.ascii.allocUpperString(exec.local_arena, algo_name);
const digest_type = crypto.findDigest(normalized) catch return error.NotSupported;
const bytes = data.values;
- const out = exec.buf[0..crypto.EVP_MAX_MD_SIZE];
+ var out: [crypto.EVP_MAX_MD_SIZE]u8 = undefined;
var out_size: c_uint = 0;
- const result = crypto.EVP_Digest(bytes.ptr, bytes.len, out, &out_size, digest_type, null);
+ const result = crypto.EVP_Digest(bytes.ptr, bytes.len, &out, &out_size, digest_type, null);
lp.assert(result == 1, "SubtleCrypto.digest", .{ .algo = algo });
return local.resolvePromise(js.ArrayBuffer{ .values = out[0..out_size] });
diff --git a/src/browser/webapi/WorkerGlobalScope.zig b/src/browser/webapi/WorkerGlobalScope.zig
index 493780aaa..2aa3a5da9 100644
--- a/src/browser/webapi/WorkerGlobalScope.zig
+++ b/src/browser/webapi/WorkerGlobalScope.zig
@@ -84,7 +84,6 @@ origin: ?[]const u8 = null,
// can outlive it. Always true for a service worker: only a secure context can
// register one.
_secure_context: bool,
-buf: [1024]u8 = undefined, // same size as frame.buf
// Document charset (matches Page.charset). Workers default to UTF-8.
charset: []const u8 = "UTF-8",
js: *JS.Context,
diff --git a/src/browser/webapi/css/CSSStyleDeclaration.zig b/src/browser/webapi/css/CSSStyleDeclaration.zig
index 34400d747..5c4ae9f55 100644
--- a/src/browser/webapi/css/CSSStyleDeclaration.zig
+++ b/src/browser/webapi/css/CSSStyleDeclaration.zig
@@ -26,7 +26,6 @@ const Frame = @import("../../Frame.zig");
const Element = @import("../Element.zig");
const DOMMatrixReadOnly = @import("../DOMMatrixReadOnly.zig");
-const log = lp.log;
const String = lp.String;
const Allocator = std.mem.Allocator;
@@ -75,7 +74,7 @@ pub fn item(self: *const CSSStyleDeclaration, index: u32) []const u8 {
}
pub fn getPropertyValue(self: *const CSSStyleDeclaration, property_name: []const u8, frame: *Frame) []const u8 {
- const normalized = normalizePropertyName(property_name, &frame.buf);
+ const normalized = normalizePropertyName(frame.local_arena, property_name);
const wrapped = String.wrap(normalized);
const value = self.propertyValue(normalized, wrapped, frame);
@@ -277,7 +276,7 @@ fn resolvedDimension(element: *Element, dimension: enum { width, height }, frame
}
pub fn getPropertyPriority(self: *const CSSStyleDeclaration, property_name: []const u8, frame: *Frame) []const u8 {
- const normalized = normalizePropertyName(property_name, &frame.buf);
+ const normalized = normalizePropertyName(frame.local_arena, property_name);
return if (self.declaredImportant(.wrap(normalized))) "important" else "";
}
@@ -315,7 +314,7 @@ pub fn setProperty(self: *CSSStyleDeclaration, property_name: []const u8, value:
/// setProperty path, within a single declaration block a normal declaration must
/// not override an earlier !important one (CSS cascade precedence).
fn applyParsedDeclaration(self: *CSSStyleDeclaration, declaration: CssParser.Declaration, frame: *Frame) !void {
- const normalized = normalizePropertyName(declaration.name, &frame.buf);
+ const normalized = normalizePropertyName(frame.local_arena, declaration.name);
if (CssParser.axisShorthand(normalized)) |shorthand| {
const values = CssParser.splitAxisPair(declaration.value) orelse return;
try self.applyParsedDeclaration(.{ .name = shorthand.x, .value = values.x, .important = declaration.important }, frame);
@@ -341,7 +340,7 @@ fn setPropertyImpl(self: *CSSStyleDeclaration, property_name: []const u8, value:
return (try self.removePropertyImpl(property_name, frame)) != null;
}
- const normalized = normalizePropertyName(property_name, &frame.buf);
+ const normalized = normalizePropertyName(frame.local_arena, property_name);
if (CssParser.axisShorthand(normalized)) |shorthand| {
const values = CssParser.splitAxisPair(value) orelse return false;
const x = try self.setPropertyImpl(shorthand.x, values.x, important, frame);
@@ -384,7 +383,7 @@ pub fn removeProperty(self: *CSSStyleDeclaration, property_name: []const u8, fra
}
fn removePropertyImpl(self: *CSSStyleDeclaration, property_name: []const u8, frame: *Frame) !?[]const u8 {
- const normalized = normalizePropertyName(property_name, &frame.buf);
+ const normalized = normalizePropertyName(frame.local_arena, property_name);
if (CssParser.axisShorthand(normalized)) |shorthand| {
const old_value = self.declaredValue(.wrap(shorthand.name), frame) orelse "";
const x = try self.removePropertyImpl(shorthand.x, frame);
@@ -529,17 +528,19 @@ pub fn findProperty(self: *const CSSStyleDeclaration, name: String) ?*Property {
return null;
}
-fn normalizePropertyName(name: []const u8, buf: []u8) []const u8 {
+fn normalizePropertyName(allocator: Allocator, name: []const u8) []const u8 {
if (isCustomProperty(name)) {
// Custom properties are case-sensitive
return name;
}
- if (name.len > buf.len) {
- log.info(.dom, "css.long.name", .{ .name = name });
- return name;
- }
- return std.ascii.lowerString(buf, name);
+ // Internal lookups (layout, CDP) pass lowercase names, often outside of a
+ // JS call where nothing resets local_arena.
+ for (name) |c| {
+ if (std.ascii.isUpper(c)) break;
+ } else return name;
+
+ return std.ascii.allocLowerString(allocator, name) catch name;
}
fn isCustomProperty(name: []const u8) bool {
diff --git a/src/browser/webapi/css/CSSStyleProperties.zig b/src/browser/webapi/css/CSSStyleProperties.zig
index 32cecf9b7..4293987c5 100644
--- a/src/browser/webapi/css/CSSStyleProperties.zig
+++ b/src/browser/webapi/css/CSSStyleProperties.zig
@@ -23,6 +23,8 @@ const Element = @import("../Element.zig");
const Frame = @import("../../Frame.zig");
const CSSStyleDeclaration = @import("CSSStyleDeclaration.zig");
+const Allocator = std.mem.Allocator;
+
const CSSStyleProperties = @This();
pub const Proto = CSSStyleDeclaration;
@@ -49,7 +51,7 @@ fn setNamed(self: *CSSStyleProperties, name: []const u8, value: []const u8, fram
if (method_names.has(name)) {
return error.NotHandled;
}
- const dash_case = camelCaseToDashCase(name, &frame.buf);
+ const dash_case = try camelCaseToDashCase(frame.local_arena, name);
try self._proto.setProperty(dash_case, value, null, frame);
}
@@ -58,7 +60,7 @@ fn getNamed(self: *CSSStyleProperties, name: []const u8, frame: *Frame) ![]const
return error.NotHandled;
}
- const dash_case = camelCaseToDashCase(name, &frame.buf);
+ const dash_case = try camelCaseToDashCase(frame.local_arena, name);
// Only apply vendor prefix filtering for camelCase access (no dashes in input)
// Bracket notation with dash-case (e.g., div.style['-moz-user-select']) should return the actual value
@@ -322,13 +324,13 @@ fn isKnownCSSProperty(dash_case: []const u8) bool {
return known_properties.has(dash_case);
}
-fn camelCaseToDashCase(name: []const u8, buf: []u8) []const u8 {
+fn camelCaseToDashCase(allocator: Allocator, name: []const u8) ![]const u8 {
if (name.len == 0) {
return name;
}
// Special case: cssFloat -> float
- const lower_name = std.ascii.lowerString(buf, name);
+ const lower_name = try std.ascii.allocLowerString(allocator, name);
if (std.mem.eql(u8, lower_name, "cssfloat")) {
return "float";
}
@@ -354,6 +356,9 @@ fn camelCaseToDashCase(name: []const u8, buf: []u8) []const u8 {
break :blk false;
};
+ // name[0] is lowercase, so the vendor dash plus at most two bytes for
+ // every other character fits in twice the length.
+ const buf = try allocator.alloc(u8, name.len * 2);
var write_pos: usize = 0;
if (has_vendor_prefix) {
@@ -362,19 +367,13 @@ fn camelCaseToDashCase(name: []const u8, buf: []u8) []const u8 {
}
for (name, 0..) |c, i| {
- if (write_pos >= buf.len) {
- return lower_name;
- }
-
if (std.ascii.isUpper(c)) {
const skip_dash = has_vendor_prefix and i < 10 and write_pos == 1;
if (i > 0 and !skip_dash) {
- if (write_pos >= buf.len) break;
buf[write_pos] = '-';
write_pos += 1;
}
- if (write_pos >= buf.len) break;
buf[write_pos] = std.ascii.toLower(c);
write_pos += 1;
} else {
diff --git a/src/browser/webapi/element/Attribute.zig b/src/browser/webapi/element/Attribute.zig
index 74674b96a..97255e7fb 100644
--- a/src/browser/webapi/element/Attribute.zig
+++ b/src/browser/webapi/element/Attribute.zig
@@ -430,8 +430,8 @@ pub const List = struct {
return result.entry;
}
- // Dangerous, the returned normalized name is only valid until someone
- // else uses pages.buf.
+ // Dangerous, the returned normalized name can live in frame.local_arena,
+ // so it's only valid until that's reset.
const NormalizeAndEntry = struct {
entry: ?*Entry,
normalized: String,
@@ -578,11 +578,7 @@ fn normalizeNameForLookup(name: String, frame: *Frame) !String {
if (!needsLowerCasing(name.str())) {
return name;
}
- const normalized = if (name.len < frame.buf.len)
- std.ascii.lowerString(&frame.buf, name.str())
- else
- try std.ascii.allocLowerString(frame.local_arena, name.str());
-
+ const normalized = try std.ascii.allocLowerString(frame.local_arena, name.str());
return .wrap(normalized);
}
diff --git a/src/browser/webapi/element/html/Image.zig b/src/browser/webapi/element/html/Image.zig
index b3f1d4007..6307c1d01 100644
--- a/src/browser/webapi/element/html/Image.zig
+++ b/src/browser/webapi/element/html/Image.zig
@@ -52,12 +52,12 @@ pub fn constructor(w_: ?u32, h_: ?u32, frame: *Frame) !*Image {
const node = try Frame.node_factory.createElementNS(frame.document, .html, "img", null);
const el = node.as(Element);
- if (w_) |w| blk: {
- const w_string = std.mem.print(&frame.buf, "{d}", .{w}) catch break :blk;
+ if (w_) |w| {
+ const w_string = try frame.local_arena.print("{d}", .{w});
try el.setAttributeSafe(comptime .wrap("width"), .wrap(w_string), frame);
}
- if (h_) |h| blk: {
- const h_string = std.mem.print(&frame.buf, "{d}", .{h}) catch break :blk;
+ if (h_) |h| {
+ const h_string = try frame.local_arena.print("{d}", .{h});
try el.setAttributeSafe(comptime .wrap("height"), .wrap(h_string), frame);
}
return el.as(Image);
diff --git a/src/browser/webapi/element/html/Media.zig b/src/browser/webapi/element/html/Media.zig
index 5132c9723..02e4a9d23 100644
--- a/src/browser/webapi/element/html/Media.zig
+++ b/src/browser/webapi/element/html/Media.zig
@@ -123,14 +123,11 @@ pub fn as(self: *Media, comptime T: type) *T {
return self.is(T).?;
}
-fn canPlayType(_: *const Media, mime_type: []const u8, frame: *Frame) []const u8 {
+fn canPlayType(_: *const Media, mime_type: []const u8, frame: *Frame) ![]const u8 {
const pos = std.mem.findScalar(u8, mime_type, ';') orelse mime_type.len;
const base_type = std.mem.trim(u8, mime_type[0..pos], &std.ascii.whitespace);
- if (base_type.len > frame.buf.len) {
- return "";
- }
- const lower = std.ascii.lowerString(&frame.buf, base_type);
+ const lower = try std.ascii.allocLowerString(frame.local_arena, base_type);
if (isProbablySupported(lower)) {
return "probably";
diff --git a/src/browser/webapi/net/Headers.zig b/src/browser/webapi/net/Headers.zig
index d880478f6..827116705 100644
--- a/src/browser/webapi/net/Headers.zig
+++ b/src/browser/webapi/net/Headers.zig
@@ -49,12 +49,12 @@ pub fn initGuarded(opts_: ?InitOpts, guard: Guard, exec: *const Execution) !*Hea
switch (opts) {
.obj => |obj| break :blk try KeyValueList.copy(exec.page_arena, obj._list),
.js_obj => |js_obj| {
- var list = try KeyValueList.fromJsObject(exec.page_arena, js_obj, normalizeHeaderName, exec.buf);
+ var list = try KeyValueList.fromJsObject(exec.page_arena, js_obj, normalizeHeaderName, exec.local_arena);
try validateAndNormalize(&list);
break :blk list;
},
.strings => |kvs| {
- var list = try KeyValueList.fromArray(exec.page_arena, kvs, normalizeHeaderName, exec.buf);
+ var list = try KeyValueList.fromArray(exec.page_arena, kvs, normalizeHeaderName, exec.local_arena);
try validateAndNormalize(&list);
break :blk list;
},
@@ -371,14 +371,11 @@ fn validateAndNormalizeName(name: []const u8, exec: *const Execution) ![]const u
if (Mime.isHttpToken(name) == false) {
return exec.js.typeError("Invalid header name");
}
- return normalizeHeaderName(name, exec.buf);
+ return normalizeHeaderName(exec.local_arena, name);
}
-fn normalizeHeaderName(name: []const u8, buf: []u8) []const u8 {
- if (name.len > buf.len) {
- return name;
- }
- return std.ascii.lowerString(buf, name);
+fn normalizeHeaderName(allocator: Allocator, name: []const u8) Allocator.Error![]const u8 {
+ return std.ascii.allocLowerString(allocator, name);
}
fn normalizeValue(value: []const u8, exec: *const Execution) ![]const u8 {
diff --git a/src/browser/webapi/net/Request.zig b/src/browser/webapi/net/Request.zig
index ba9d11269..a162fe268 100644
--- a/src/browser/webapi/net/Request.zig
+++ b/src/browser/webapi/net/Request.zig
@@ -265,7 +265,7 @@ fn parseMethod(method: []const u8, exec: *const Execution) !http.Method {
return error.TypeError;
}
- const lower = std.ascii.lowerString(exec.buf, method);
+ const lower = try std.ascii.allocLowerString(exec.local_arena, method);
const method_lookup = std.StaticStringMap(http.Method).initComptime(.{
.{ "get", .GET },
diff --git a/src/browser/webapi/net/URLSearchParams.zig b/src/browser/webapi/net/URLSearchParams.zig
index 055b39bb4..322b434db 100644
--- a/src/browser/webapi/net/URLSearchParams.zig
+++ b/src/browser/webapi/net/URLSearchParams.zig
@@ -60,7 +60,7 @@ pub fn init(opts_: ?InitOpts, exec: *const Execution) !*URLSearchParams {
const params: KeyValueList = blk: {
const opts = opts_ orelse break :blk .empty;
switch (opts) {
- .query_string => |qs| break :blk try paramsFromString(arena.allocator(), qs, exec.buf),
+ .query_string => |qs| break :blk try paramsFromString(arena.allocator(), qs, exec.local_arena),
.form_data => |fd| break :blk try fd.toKeyValueList(arena.allocator()),
.value => |js_val| {
if (js_val.isObject()) {
@@ -72,11 +72,11 @@ pub fn init(opts_: ?InitOpts, exec: *const Execution) !*URLSearchParams {
if (try js_val.iterator()) |it| {
break :blk try paramsFromIterator(arena.allocator(), it);
}
- // normalizer is null, so frame won't be used
- break :blk try KeyValueList.fromJsObject(arena.allocator(), js_val.toObject(), null, exec.buf);
+ // normalizer is null, so local_arena won't be used
+ break :blk try KeyValueList.fromJsObject(arena.allocator(), js_val.toObject(), null, exec.local_arena);
}
if (js_val.isString()) |js_str| {
- break :blk try paramsFromString(arena.allocator(), try js_str.toSliceWithAlloc(arena.allocator()), exec.buf);
+ break :blk try paramsFromString(arena.allocator(), try js_str.toSliceWithAlloc(arena.allocator()), exec.local_arena);
}
return error.InvalidArgument;
},
@@ -104,7 +104,7 @@ pub fn acquireRef(self: *URLSearchParams) void {
}
pub fn updateFromString(self: *URLSearchParams, query_string: []const u8, exec: *const Execution) !void {
- self._params = try paramsFromString(self._arena.allocator(), query_string, exec.buf);
+ self._params = try paramsFromString(self._arena.allocator(), query_string, exec.local_arena);
}
pub fn getSize(self: *const URLSearchParams) usize {
@@ -276,7 +276,7 @@ fn paramsFromIterator(allocator: Allocator, it: js.Value.Iterator) !KeyValueList
return params;
}
-fn paramsFromString(allocator: Allocator, input_: []const u8, buf: []u8) !KeyValueList {
+fn paramsFromString(allocator: Allocator, input_: []const u8, local_arena: Allocator) !KeyValueList {
if (input_.len == 0) {
return .empty;
}
@@ -302,10 +302,10 @@ fn paramsFromString(allocator: Allocator, input_: []const u8, buf: []u8) !KeyVal
var value: String = undefined;
if (std.mem.findScalarPos(u8, entry, 0, '=')) |idx| {
- name = try unescape(allocator, entry[0..idx], buf);
- value = try unescape(allocator, entry[idx + 1 ..], buf);
+ name = try unescape(allocator, entry[0..idx], local_arena);
+ value = try unescape(allocator, entry[idx + 1 ..], local_arena);
} else {
- name = try unescape(allocator, entry, buf);
+ name = try unescape(allocator, entry, local_arena);
value = comptime .wrap("");
}
@@ -327,7 +327,7 @@ fn isEscapeTriplet(value: []const u8, i: usize) bool {
return i + 2 < value.len and std.ascii.isHex(value[i + 1]) and std.ascii.isHex(value[i + 2]);
}
-fn unescape(arena: Allocator, value: []const u8, buf: []u8) !String {
+fn unescape(arena: Allocator, value: []const u8, local_arena: Allocator) !String {
if (value.len == 0) {
return comptime .wrap("");
}
@@ -352,12 +352,7 @@ fn unescape(arena: Allocator, value: []const u8, buf: []u8) !String {
return String.init(arena, value, .{});
}
- var out = buf;
- var duped = false;
- if (buf.len < unescaped_len) {
- out = try arena.alloc(u8, unescaped_len);
- duped = true;
- }
+ const out = try local_arena.alloc(u8, unescaped_len);
in_i = 0;
for (0..unescaped_len) |i| {
@@ -374,7 +369,7 @@ fn unescape(arena: Allocator, value: []const u8, buf: []u8) !String {
}
}
- return String.init(arena, out[0..unescaped_len], .{ .dupe = !duped });
+ return String.init(arena, out, .{});
}
const HEX_DECODE_ARRAY = blk: {
diff --git a/src/browser/xpath/functions.zig b/src/browser/xpath/functions.zig
index 3a44445bd..54d81e1f5 100644
--- a/src/browser/xpath/functions.zig
+++ b/src/browser/xpath/functions.zig
@@ -148,8 +148,7 @@ fn localNameFn(arena: Allocator, args: []const result.Result, ctx: *Node) Error!
// (lowercase, namespace-prefix stripped) — lifetime exceeds the
// per-evaluation arena, so we borrow instead of duping.
if (node.is(Element)) |el| return el.getLocalName();
- var buf: [256]u8 = undefined;
- return std.ascii.allocLowerString(arena, node.getNodeName(&buf));
+ return std.ascii.allocLowerString(arena, node.getNodeName(arena));
}
fn nameFn(arena: Allocator, args: []const result.Result, ctx: *Node) Error![]const u8 {
@@ -157,8 +156,7 @@ fn nameFn(arena: Allocator, args: []const result.Result, ctx: *Node) Error![]con
// Diverges from `local-name` only on namespaced elements: `name`
// keeps the prefix (`ns:foo`), `local-name` strips it (`foo`).
if (node.is(Element)) |el| return el.getTagNameLower();
- var buf: [256]u8 = undefined;
- return std.ascii.allocLowerString(arena, node.getNodeName(&buf));
+ return std.ascii.allocLowerString(arena, node.getNodeName(arena));
}
fn firstNodeOrCtx(args: []const result.Result, ctx: *Node) ?*Node {
diff --git a/src/server/cdp/Node.zig b/src/server/cdp/Node.zig
index fce4d9cce..ffeb49ec6 100644
--- a/src/server/cdp/Node.zig
+++ b/src/server/cdp/Node.zig
@@ -23,7 +23,6 @@ const std = @import("std");
const lp = @import("lightpanda");
const id = @import("id.zig");
-const Frame = @import("../../browser/Frame.zig");
const DOMNode = @import("../../browser/webapi/Node.zig");
const IFrame = @import("../../browser/webapi/element/html/IFrame.zig");
const NodeRegistry = @import("../../NodeRegistry.zig");
@@ -247,8 +246,9 @@ pub const Writer = struct {
try w.write(dom_node.getNodeType());
try w.objectField("nodeName");
- var name_buf: [Frame.BUF_SIZE]u8 = undefined;
- try w.write(dom_node.getNodeName(&name_buf));
+ var name_buf: [1024]u8 = undefined;
+ var name_fba = std.heap.FixedBufferAllocator.init(&name_buf);
+ try w.write(dom_node.getNodeName(name_fba.allocator()));
try w.objectField("nodeValue");
if (dom_node.getNodeValue()) |nv| {