Lightpanda: the headless browser designed for AI and automation
use node's own frame, not the callers
Karl Seguin3b4088ab62c0
diff --git a/src/SemanticTree.zig b/src/SemanticTree.zigindex efbd0f593..685b84ffa 100644--- a/src/SemanticTree.zig+++ b/src/SemanticTree.zig@@ -56,6 +56,7 @@ pub fn jsonStringify(self: @This(), jw: *std.json.Stringify) error{WriteFailed}!.xpath_buffer = &xpath_buffer,.listener_targets = listener_targets,.label_index = &label_index,+ .owner_frame = self.dom_node.ownerFrame(self.frame),};self.walk(&ctx, self.dom_node, null, &visitor, 1, 0) catch |err| {log.err(.app, "semantic tree json dump failed", .{ .err = err });@@ -75,6 +76,7 @@ pub fn textStringify(self: @This(), writer: *std.Io.Writer) error{WriteFailed}!v.xpath_buffer = &xpath_buffer,.listener_targets = listener_targets,.label_index = &label_index,+ .owner_frame = self.dom_node.ownerFrame(self.frame),};self.walk(&ctx, self.dom_node, null, &visitor, 1, 0) catch |err| {log.err(.app, "semantic tree text dump failed", .{ .err = err });@@ -106,6 +108,7 @@ const WalkContext = struct {xpath_buffer: *std.ArrayList(u8),listener_targets: interactive.ListenerTargetMap,label_index: *Label.LabelByForIndex,+ owner_frame: *Frame, // node's ow frame, not the callers};fn walk(@@ -129,10 +132,11 @@ fn walk(// Hidden subtrees are never entered, so below the root only the// element's own display matters.+ const style_manager = &ctx.owner_frame._style_manager;const hidden = if (current_depth == 0)- !el.isVisible(self.frame, .scan)+ style_manager.isHidden(el, .{}, .scan)else- self.frame._style_manager.hasDisplayNone(el, .scan);+ style_manager.hasDisplayNone(el, .scan);if (hidden) {return;}@@ -755,6 +759,40 @@ test "SemanticTree backendDOMNodeId" {try testing.expect(std.mem.indexOf(u8, json_str, "\"backendDOMNodeId\":") != null);}+test "SemanticTree: styles come from the node's own frame" {+ var registry: NodeRegistry = .init(testing.allocator);+ defer registry.deinit();++ // The caller's frame hides #inner; the frame that actually owns the walked+ // subtree does not. A backendNodeId lookup can hand us a node from another+ // frame, so the walk must not use the caller's stylesheets.+ var page_a = try testing.pageTest("cdp/semantic_tree_frame_a.html", .{});+ defer page_a.close();+ var page_b = try testing.pageTest("cdp/semantic_tree_frame_b.html", .{});+ defer page_b.close();++ const frame_a = page_a.frame().?;+ const frame_b = page_b.frame().?;++ const target = (try frame_b.window._document.querySelector(.wrap("#target"), frame_b)).?.asNode();++ const st: Self = .{+ .dom_node = target,+ .registry = ®istry,+ .frame = frame_a,+ .arena = testing.arena_allocator,+ .prune = false,+ .interactive_only = false,+ .max_depth = std.math.maxInt(u32) - 1,+ };++ var aw: std.Io.Writer.Allocating = .init(testing.allocator);+ defer aw.deinit();++ try st.textStringify(&aw.writer);+ try testing.expect(std.mem.indexOf(u8, aw.written(), "inner-b") != null);+}+test "SemanticTree max_depth" {var registry: NodeRegistry = .init(testing.allocator);defer registry.deinit();diff --git a/src/browser/tests/cdp/semantic_tree_frame_a.html b/src/browser/tests/cdp/semantic_tree_frame_a.htmlnew file mode 100644index 000000000..5753081f1--- /dev/null+++ b/src/browser/tests/cdp/semantic_tree_frame_a.html@@ -0,0 +1,2 @@+<style>#inner { display: none }</style>+<p>page-a</p>diff --git a/src/browser/tests/cdp/semantic_tree_frame_b.html b/src/browser/tests/cdp/semantic_tree_frame_b.htmlnew file mode 100644index 000000000..967adff52--- /dev/null+++ b/src/browser/tests/cdp/semantic_tree_frame_b.html@@ -0,0 +1 @@+<div id=target><p id=inner>inner-b</p></div>diff --git a/src/server/cdp/CDP.zig b/src/server/cdp/CDP.zigindex 78521bc7b..7eaf886e1 100644--- a/src/server/cdp/CDP.zig+++ b/src/server/cdp/CDP.zig@@ -31,7 +31,6 @@ const Mime = @import("../../browser/Mime.zig");const Frame = @import("../../browser/Frame.zig");const Browser = @import("../../browser/Browser.zig");const Session = @import("../../browser/Session.zig");-const Element = @import("../../browser/webapi/Element.zig");const Label = @import("../../browser/webapi/element/html/Label.zig");const WS = @import("../WS.zig");