Skip to content

Lightpanda: the headless browser designed for AI and automation

Add Page.style_version stamp for style-dependent state

Adrià Arrufat84c46b63313a
diff --git a/src/browser/Frame.zig b/src/browser/Frame.zig
index 2408ff511..77ee96262 100644
--- a/src/browser/Frame.zig
+++ b/src/browser/Frame.zig
@@ -2176,6 +2176,7 @@ pub fn openPopup(self: *Frame, opts: OpenPopupOpts) !*Frame {
pub fn domChanged(self: *Frame) void {
self._page.dom_version += 1;
+ self.styleChanged();
// A DOM change is our "rendering opportunity": re-evaluate the layout
// observers. Both are no-ops unless something they track actually changed.
@@ -2183,6 +2184,13 @@ pub fn domChanged(self: *Frame) void {
observers.scheduleResizeChecks(self);
}
+/// A change that can alter a selector match or cascade result without changing
+/// what live collections see: form state, custom element definitions, text
+/// data, stylesheets. Stamps the StyleManager memo.
+pub fn styleChanged(self: *Frame) void {
+ self._page.style_version += 1;
+}
+
const ElementIdMaps = struct { lookup: *std.StringHashMapUnmanaged(*Element), removed_ids: *std.StringHashMapUnmanaged(void) };
fn getElementIdMap(frame: *Frame, node: *Node) ElementIdMaps {
@@ -2948,6 +2956,10 @@ pub fn _insertNodeRelative(self: *Frame, comptime from_parser: bool, parent: *No
// The parser path does its own (limited) notification and
// connected-callback work, then returns.
if (comptime from_parser) {
+ // Only the cascade stamp moves for parser insertions; live collections
+ // keep their cursors mid-parse, as before.
+ self.styleChanged();
+
// Main-document parser insertions notify per node: scripts running
// during parsing can observe the document. Fragment parses
// (innerHTML et al.) stay silent; Node.setHTML queues one combined
diff --git a/src/browser/Page.zig b/src/browser/Page.zig
index 8f6a7190f..bb0bf2c1d 100644
--- a/src/browser/Page.zig
+++ b/src/browser/Page.zig
@@ -57,6 +57,11 @@ session: *Session,
// a cached lookup on Frame 2. We picked the latter.
dom_version: usize = 0,
+// Cascade stamp, bumped by Frame.styleChanged: a superset of dom_version that
+// also moves for non-tree state (form state, custom element definitions, text
+// data, stylesheets). Validates the StyleManager memo.
+style_version: usize = 0,
+
// Monotonic creation counter for BroadcastChannels in this Page. A postMessage
// captures the current value so delivery targets only channels that existed
// when it was called
diff --git a/src/browser/StyleManager.zig b/src/browser/StyleManager.zig
index e25a4afbc..367cf12ea 100644
--- a/src/browser/StyleManager.zig
+++ b/src/browser/StyleManager.zig
@@ -506,13 +506,9 @@ fn addRawRule(self: *StyleManager, build_arena: Allocator, selector_text: []cons
}
}
-pub fn sheetRemoved(self: *StyleManager) void {
- self.dirty = true;
- Frame.observers.scheduleResizeDelivery(self.frame);
-}
-
pub fn sheetModified(self: *StyleManager) void {
self.dirty = true;
+ self.frame.styleChanged();
Frame.observers.scheduleResizeDelivery(self.frame);
}
diff --git a/src/browser/webapi/CData.zig b/src/browser/webapi/CData.zig
index 4eeab1337..a51f9faab 100644
--- a/src/browser/webapi/CData.zig
+++ b/src/browser/webapi/CData.zig
@@ -310,7 +310,7 @@ pub fn setData(self: *CData, value: ?[]const u8, frame: *Frame) !void {
self._data = .empty;
}
- Frame.observers.notifyCharacterDataChange(frame, self.asNode(), old_value);
+ self.dataChanged(old_value, frame);
}
/// JS bridge wrapper for `data` setter.
@@ -354,6 +354,13 @@ pub fn isEqualNode(self: *const CData, other: *const CData) bool {
return self._data.eql(other._data);
}
+/// Text data can flip `:empty` but never a live collection, so only the style
+/// stamp moves.
+fn dataChanged(self: *CData, old: String, frame: *Frame) void {
+ frame.styleChanged();
+ Frame.observers.notifyCharacterDataChange(frame, self.asNode(), old);
+}
+
pub fn appendData(self: *CData, data: []const u8, frame: *Frame) !void {
// Per DOM spec, appendData(data) is replaceData(length, 0, data).
const length = self.getLength();
@@ -382,7 +389,7 @@ pub fn deleteData(self: *CData, offset: usize, count: usize, frame: *Frame) !voi
old_value[range.end..],
});
}
- Frame.observers.notifyCharacterDataChange(frame, self.asNode(), old_data);
+ self.dataChanged(old_data, frame);
}
pub fn insertData(self: *CData, offset: usize, data: []const u8, frame: *Frame) !void {
@@ -398,7 +405,7 @@ pub fn insertData(self: *CData, offset: usize, data: []const u8, frame: *Frame)
data,
existing[byte_offset..],
});
- Frame.observers.notifyCharacterDataChange(frame, self.asNode(), old_value);
+ self.dataChanged(old_value, frame);
}
pub fn replaceData(self: *CData, offset: usize, count: usize, data: []const u8, frame: *Frame) !void {
@@ -417,7 +424,7 @@ pub fn replaceData(self: *CData, offset: usize, count: usize, data: []const u8,
data,
existing[range.end..],
});
- Frame.observers.notifyCharacterDataChange(frame, self.asNode(), old_value);
+ self.dataChanged(old_value, frame);
}
pub fn substringData(self: *const CData, offset: usize, count: usize) ![]const u8 {
diff --git a/src/browser/webapi/CustomElementRegistry.zig b/src/browser/webapi/CustomElementRegistry.zig
index 25f8ca25b..4afcd6b7f 100644
--- a/src/browser/webapi/CustomElementRegistry.zig
+++ b/src/browser/webapi/CustomElementRegistry.zig
@@ -104,6 +104,7 @@ pub fn define(self: *CustomElementRegistry, name: []const u8, constructor: js.Fu
}
gop.key_ptr.* = owned_name;
gop.value_ptr.* = definition;
+ frame.styleChanged();
// Upgrade any undefined custom elements with this name
var idx: usize = 0;
diff --git a/src/browser/webapi/collections/HTMLOptionsCollection.zig b/src/browser/webapi/collections/HTMLOptionsCollection.zig
index 7a1f638ae..85b4e9bd8 100644
--- a/src/browser/webapi/collections/HTMLOptionsCollection.zig
+++ b/src/browser/webapi/collections/HTMLOptionsCollection.zig
@@ -63,8 +63,8 @@ pub fn getSelectedIndex(self: *const HTMLOptionsCollection) i32 {
return self._select.getSelectedIndex();
}
-pub fn setSelectedIndex(self: *HTMLOptionsCollection, index: i32) !void {
- return self._select.setSelectedIndex(index);
+pub fn setSelectedIndex(self: *HTMLOptionsCollection, index: i32, frame: *Frame) !void {
+ return self._select.setSelectedIndex(index, frame);
}
const Option = @import("../element/html/Option.zig");
diff --git a/src/browser/webapi/element/html/Input.zig b/src/browser/webapi/element/html/Input.zig
index 2f605324d..3f892323a 100644
--- a/src/browser/webapi/element/html/Input.zig
+++ b/src/browser/webapi/element/html/Input.zig
@@ -168,6 +168,9 @@ pub fn setValue(self: *Input, value: []const u8, frame: *Frame) !void {
}
self._value = try frame.dupeString(sanitized);
self._user_edited = false;
+ if (changed) {
+ frame.styleChanged();
+ }
// move the text entry cursor position to the end of the text control
if (changed and self.selectionAvailable()) {
@@ -202,14 +205,16 @@ pub fn setChecked(self: *Input, checked: bool, frame: *Frame) !void {
// This should _not_ call setAttribute. It updates the current state only
self._checked = checked;
self._checked_dirty = true;
+ frame.styleChanged();
}
pub fn getIndeterminate(self: *const Input) bool {
return self._indeterminate;
}
-pub fn setIndeterminate(self: *Input, value: bool) !void {
+pub fn setIndeterminate(self: *Input, value: bool, frame: *Frame) !void {
self._indeterminate = value;
+ frame.styleChanged();
}
pub fn getDefaultChecked(self: *const Input) bool {
diff --git a/src/browser/webapi/element/html/Select.zig b/src/browser/webapi/element/html/Select.zig
index 0031048d4..a79f0bfb9 100644
--- a/src/browser/webapi/element/html/Select.zig
+++ b/src/browser/webapi/element/html/Select.zig
@@ -176,6 +176,7 @@ pub fn setValue(self: *Select, value: []const u8, frame: *Frame) !void {
while (it.next()) |option| {
option._selected = std.mem.eql(u8, option.getValue(frame), value);
}
+ frame.domChanged();
}
pub fn getSelectedIndex(self: *Select) i32 {
@@ -197,7 +198,7 @@ pub fn getSelectedIndex(self: *Select) i32 {
return if (has_options) 0 else -1;
}
-pub fn setSelectedIndex(self: *Select, index: i32) !void {
+pub fn setSelectedIndex(self: *Select, index: i32, frame: *Frame) !void {
// Mark that selectedIndex has been explicitly set
self._selected_index_set = true;
@@ -215,6 +216,7 @@ pub fn setSelectedIndex(self: *Select, index: i32) !void {
}
current_index += 1;
}
+ frame.domChanged();
}
// https://html.spec.whatwg.org/multipage/form-elements.html#dom-select-type