Skip to content

node: don't call owner twice in _insertBefore #923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 5, 2025
Merged

node: don't call owner twice in _insertBefore #923

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd9e4db
node: don't call owner twice in _insertBefore
krichprollsch Aug 5, 2025
b2b2e97
zig fmt
krichprollsch Aug 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 27 additions & 29 deletions src/browser/dom/node.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,11 @@ pub const Node = struct {
const self_owner = try parser.nodeOwnerDocument(self);
const child_owner = try parser.nodeOwnerDocument(child);

// If the node to be inserted has a different ownerDocument than the parent node,
// modern browsers automatically adopt the node and its descendants into
// the parent's ownerDocument.
// If the node to be inserted has a different ownerDocument than the parent node,
// modern browsers automatically adopt the node and its descendants into
// the parent's ownerDocument.
// This process is known as adoption.
// (7.1) https://dom.spec.whatwg.org/#concept-node-insert
// (7.1) https://dom.spec.whatwg.org/#concept-node-insert
if (child_owner == null or (child_owner.? != self_owner.?)) {
const w = Walker{};
var current = child;
Expand Down Expand Up @@ -307,27 +307,28 @@ pub const Node = struct {
}

pub fn _insertBefore(self: *parser.Node, new_node: *parser.Node, ref_node_: ?*parser.Node) !Union {
if (ref_node_ == null) {
return _appendChild(self, new_node);
}

const self_owner = try parser.nodeOwnerDocument(self);
const new_node_owner = try parser.nodeOwnerDocument(new_node);

// If the node to be inserted has a different ownerDocument than the parent node,
// modern browsers automatically adopt the node and its descendants into
// the parent's ownerDocument.
// If the node to be inserted has a different ownerDocument than the parent node,
// modern browsers automatically adopt the node and its descendants into
// the parent's ownerDocument.
// This process is known as adoption.
// (7.1) https://dom.spec.whatwg.org/#concept-node-insert
// (7.1) https://dom.spec.whatwg.org/#concept-node-insert
if (new_node_owner == null or (new_node_owner.? != self_owner.?)) {
const w = Walker{};
var current = new_node;
while(true) {
while (true) {
current.owner = self_owner;
current = try w.get_next(new_node, current) orelse break;
}
}

if (ref_node_) |ref_node| {
return Node.toInterface(try parser.nodeInsertBefore(self, new_node, ref_node));
}
return _appendChild(self, new_node);
return Node.toInterface(try parser.nodeInsertBefore(self, new_node, ref_node_.?));
}

pub fn _isDefaultNamespace(self: *parser.Node, namespace: ?[]const u8) !bool {
Expand Down Expand Up @@ -756,7 +757,7 @@ test "Browser.DOM.node" {
}

test "Browser.DOM.node.owner" {
var runner = try testing.jsRunner(testing.tracking_allocator, .{ .html=
var runner = try testing.jsRunner(testing.tracking_allocator, .{ .html =
\\ <div id="target-container">
\\ <p id="reference-node">
\\ I am the original reference node.
Expand All @@ -770,12 +771,9 @@ test "Browser.DOM.node.owner" {
.{
\\ const parser = new DOMParser();
\\ const newDoc = parser.parseFromString('<div id="new-node"><p>Hey</p><span>Marked</span></div>', 'text/html');

\\ const newNode = newDoc.getElementById('new-node');

\\ const parent = document.getElementById('target-container');
\\ const referenceNode = document.getElementById('reference-node');

\\ parent.insertBefore(newNode, referenceNode);
\\ const k = document.getElementById('new-node');
\\ const ptag = k.querySelector('p');
Expand All @@ -784,18 +782,18 @@ test "Browser.DOM.node.owner" {
\\ const anotherNewNode = anotherDoc.getElementById('another-new-node');
\\
\\ parent.appendChild(anotherNewNode)
,
,
"[object HTMLDivElement]",
},
.{"parent.ownerDocument === newNode.ownerDocument", "true" },
.{"parent.ownerDocument === anotherNewNode.ownerDocument", "true"},
.{"newNode.firstChild.nodeName", "P"},
.{"ptag.ownerDocument === parent.ownerDocument", "true"},
.{"spanTag.ownerDocument === parent.ownerDocument", "true"},
.{"parent.contains(newNode)", "true"},
.{"parent.contains(anotherNewNode)", "true"},
.{"anotherDoc.contains(anotherNewNode)", "false"},
.{"newDoc.contains(newNode)", "false"},

.{ "parent.ownerDocument === newNode.ownerDocument", "true" },
.{ "parent.ownerDocument === anotherNewNode.ownerDocument", "true" },
.{ "newNode.firstChild.nodeName", "P" },
.{ "ptag.ownerDocument === parent.ownerDocument", "true" },
.{ "spanTag.ownerDocument === parent.ownerDocument", "true" },
.{ "parent.contains(newNode)", "true" },
.{ "parent.contains(anotherNewNode)", "true" },
.{ "anotherDoc.contains(anotherNewNode)", "false" },
.{ "newDoc.contains(newNode)", "false" },
}, .{});
}
}