Lightpanda: the headless browser designed for AI and automation
Add re-used scratch for text transform
Karl Seguind7f0dfc533b9
diff --git a/src/browser/StyleManager.zig b/src/browser/StyleManager.zigindex bfc1f0e14..d3e2cd197 100644--- a/src/browser/StyleManager.zig+++ b/src/browser/StyleManager.zig@@ -1305,20 +1305,31 @@ pub const TextTransform = enum(u3) {return .none;}- var result: TextTransform = .none;+ // At most one case keyword, alongside any of the non-case ones.+ var result: ?TextTransform = null;+ var any = false;var it = std.mem.tokenizeAny(u8, trimmed, &std.ascii.whitespace);while (it.next()) |token| {- if (std.ascii.eqlIgnoreCase(token, "uppercase")) {- result = .uppercase;- } else if (std.ascii.eqlIgnoreCase(token, "lowercase")) {- result = .lowercase;- } else if (std.ascii.eqlIgnoreCase(token, "capitalize")) {- result = .capitalize;- } else if (!(std.ascii.eqlIgnoreCase(token, "full-width") or std.ascii.eqlIgnoreCase(token, "full-size-kana") or std.ascii.eqlIgnoreCase(token, "math-auto"))) {+ any = true;+ const case: TextTransform = if (std.ascii.eqlIgnoreCase(token, "uppercase"))+ .uppercase+ else if (std.ascii.eqlIgnoreCase(token, "lowercase"))+ .lowercase+ else if (std.ascii.eqlIgnoreCase(token, "capitalize"))+ .capitalize+ else if (std.ascii.eqlIgnoreCase(token, "full-width") or std.ascii.eqlIgnoreCase(token, "full-size-kana") or std.ascii.eqlIgnoreCase(token, "math-auto"))+ continue+ else+ return null;+ if (result != null) {return null;}+ result = case;+ }+ if (any == false) {+ return null;}- return result;+ return result orelse .none;}/// The computed-value keyword, as getComputedStyle reports it.diff --git a/src/browser/tests/css/text_transform.html b/src/browser/tests/css/text_transform.htmlindex 9cc1bd074..e9f4d0965 100644--- a/src/browser/tests/css/text_transform.html+++ b/src/browser/tests/css/text_transform.html@@ -18,6 +18,7 @@.combo { text-transform: uppercase full-width; }#id-wins { text-transform: lowercase; }.bogus { text-transform: shout; }+ .two-cases { text-transform: uppercase lowercase; }</style><span id=inline style="text-transform: uppercase">unavailable</span>@@ -29,6 +30,7 @@<span id=id-wins class=upper>Mixed</span><span id=combo class=combo>wide</span><div class=upper><span id=bogus class=bogus>still upper</span></div>+<div class=upper><span id=two-cases class=two-cases>still upper</span></div><div class=upper><span id=inline-inherit style="text-transform: inherit">kept</span></div><div class=upper><span id=inline-initial style="text-transform: initial">plain</span></div><span id=plain>Plain Text</span>@@ -46,6 +48,7 @@testing.expectEqual('lowercase', tt('id-wins'));testing.expectEqual('uppercase', tt('combo'));testing.expectEqual('uppercase', tt('bogus'));+ testing.expectEqual('uppercase', tt('two-cases'));testing.expectEqual('uppercase', tt('inline-inherit'));testing.expectEqual('none', tt('inline-initial'));testing.expectEqual('none', tt('plain'));@@ -63,6 +66,7 @@testing.expectEqual('mixed', it('id-wins'));testing.expectEqual('WIDE', it('combo'));testing.expectEqual('STILL UPPER', it('bogus'));+ testing.expectEqual('STILL UPPER', it('two-cases'));testing.expectEqual('KEPT', it('inline-inherit'));testing.expectEqual('plain', it('inline-initial'));testing.expectEqual('Plain Text', it('plain'));diff --git a/src/browser/webapi/element/Html.zig b/src/browser/webapi/element/Html.zigindex 6691aa425..0d18cd8f7 100644--- a/src/browser/webapi/element/Html.zig+++ b/src/browser/webapi/element/Html.zig@@ -29,7 +29,6 @@ const Window = @import("../Window.zig");const Element = @import("../Element.zig");const EventTarget = @import("../EventTarget.zig");const ElementInternals = @import("../ElementInternals.zig");-const TextTransform = @import("../../StyleManager.zig").TextTransform;const global_event_handlers = @import("../global_event_handlers.zig");const reflection = @import("reflection.zig");@@ -104,6 +103,7 @@ pub const UL = @import("html/UL.zig");pub const Unknown = @import("html/Unknown.zig");const log = lp.log;+const TextTransform = StyleManager.TextTransform;const HtmlElement = @This();@@ -349,10 +349,12 @@ pub fn getInnerText(self: *HtmlElement, writer: *std.Io.Writer, frame: *Frame) !var state = InnerTextState{.writer = writer,+ .scratch = .init(frame.local_arena),.style_manager = style_manager,.preserve = tag == .pre,.transform = style_manager.textTransform(el),};+ defer state.scratch.deinit();try self.collectInnerText(&state);}@@ -707,6 +709,8 @@ pub fn parseInteger(input: []const u8) ?i32 {const InnerTextState = struct {writer: *std.Io.Writer,+ scratch: std.Io.Writer.Allocating,+// The walk never leaves the root's document, so we can capture the// style_manager upfrontstyle_manager: *StyleManager,@@ -858,6 +862,12 @@ fn handleChildElement(return;}+ const display = innerTextDisplay(he, tag);+ switch (display) {+ .skip, .replaced => return,+ else => {},+ }+// text-transform inherits, so a child's own value covers its subtree only.const parent_transform = state.transform;defer state.transform = parent_transform;@@ -866,11 +876,8 @@ fn handleChildElement(state.transform = own_transform;}- switch (innerTextDisplay(he, tag)) {- // Not rendered: skip the subtree entirely (script/style/metadata/...).- .skip => {},- // Replaced/embedded content: the subtree is not rendered.- .replaced => {},+ switch (display) {+ .skip, .replaced => unreachable,.@"inline", .transparent => try he.collectInnerText(state),.block => {state.requireBreaks(1);@@ -961,8 +968,8 @@ fn writeText(c: *Node.CData, state: *InnerTextState) !void {// Every case mapping we apply keeps the UTF-8 length, so the text is// rendered to a scratch buffer and mapped in place.- var scratch: std.Io.Writer.Allocating = .init(state.style_manager.frame.local_arena);- defer scratch.deinit();+ const scratch = &state.scratch;+ scratch.clearRetainingCapacity();const out = state.writer;state.writer = &scratch.writer;const rendered = writeRenderedText(c, state);