Skip to content

Commit 18a4960

Browse files
Merge pull request #566 from lightpanda-io/null_prefix_namespace
pass null namespace/prefix to libdom
2 parents cfef222 + b971b47 commit 18a4960

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

src/browser/dom/node.zig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,7 @@ pub const Node = struct {
289289
return try parser.nodeInsertBefore(self, new_node, ref_node);
290290
}
291291

292-
pub fn _isDefaultNamespace(self: *parser.Node, namespace: []const u8) !bool {
293-
// TODO: namespace is not an optional parameter, but can be null.
292+
pub fn _isDefaultNamespace(self: *parser.Node, namespace: ?[]const u8) !bool {
294293
return try parser.nodeIsDefaultNamespace(self, namespace);
295294
}
296295

src/browser/netsurf.zig

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,8 +1273,8 @@ pub fn nodeInsertBefore(node: *Node, new_node: *Node, ref_node: *Node) !*Node {
12731273
return res.?;
12741274
}
12751275

1276-
pub fn nodeIsDefaultNamespace(node: *Node, namespace: []const u8) !bool {
1277-
const s = try strFromData(namespace);
1276+
pub fn nodeIsDefaultNamespace(node: *Node, namespace_: ?[]const u8) !bool {
1277+
const s = if (namespace_) |n| try strFromData(n) else null;
12781278
var res: bool = undefined;
12791279
const err = nodeVtable(node).dom_node_is_default_namespace.?(node, s, &res);
12801280
try DOMErr(err);
@@ -1303,9 +1303,10 @@ pub fn nodeLookupPrefix(node: *Node, namespace: []const u8) !?[]const u8 {
13031303
return strToData(s.?);
13041304
}
13051305

1306-
pub fn nodeLookupNamespaceURI(node: *Node, prefix: ?[]const u8) !?[]const u8 {
1306+
pub fn nodeLookupNamespaceURI(node: *Node, prefix_: ?[]const u8) !?[]const u8 {
13071307
var s: ?*String = undefined;
1308-
const err = nodeVtable(node).dom_node_lookup_namespace.?(node, try strFromData(prefix.?), &s);
1308+
const prefix: ?*String = if (prefix_) |p| try strFromData(p) else null;
1309+
const err = nodeVtable(node).dom_node_lookup_namespace.?(node, prefix, &s);
13091310
try DOMErr(err);
13101311
if (s == null) return null;
13111312
return strToData(s.?);

src/cdp/testing.zig

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,14 @@ const Inspector = struct {
163163
_ = object_id;
164164
return try alloc.create(i32);
165165
}
166-
pub fn contextCreated(self: *const Inspector,
167-
executor: *const Env.Executor,
168-
name: []const u8,
169-
origin: []const u8,
170-
aux_data: ?[]const u8,
171-
is_default_context: bool,) void {
166+
pub fn contextCreated(
167+
self: *const Inspector,
168+
executor: *const Env.Executor,
169+
name: []const u8,
170+
origin: []const u8,
171+
aux_data: ?[]const u8,
172+
is_default_context: bool,
173+
) void {
172174
_ = self;
173175
_ = executor;
174176
_ = name;

0 commit comments

Comments
 (0)