Skip to content

Commit c2e64c1

Browse files
committed
userctx: document is not opational anymore
1 parent 840aea9 commit c2e64c1

File tree

5 files changed

+13
-23
lines changed

5 files changed

+13
-23
lines changed

src/dom/comment.zig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,8 @@ pub const Comment = struct {
3434
pub const mem_guarantied = true;
3535

3636
pub fn constructor(userctx: UserContext, data: ?[]const u8) !*parser.Comment {
37-
if (userctx.document == null) return parser.DOMError.NotSupported;
38-
3937
return parser.documentCreateComment(
40-
parser.documentHTMLToDocument(userctx.document.?),
38+
parser.documentHTMLToDocument(userctx.document),
4139
data orelse "",
4240
);
4341
}

src/dom/document.zig

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,15 @@ pub const Document = struct {
4949
pub const mem_guarantied = true;
5050

5151
pub fn constructor(userctx: UserContext) !*parser.DocumentHTML {
52-
var title: ?[]const u8 = null;
53-
if (userctx.document) |cur| {
54-
title = try parser.documentHTMLGetTitle(cur);
55-
}
56-
const doc = try parser.documentCreateDocument(title);
57-
58-
if (userctx.document) |cur| {
59-
// we have to work w/ document instead of html document.
60-
const ddoc = parser.documentHTMLToDocument(doc);
61-
const ccur = parser.documentHTMLToDocument(cur);
62-
try parser.documentSetDocumentURI(ddoc, try parser.documentGetDocumentURI(ccur));
63-
try parser.documentSetInputEncoding(ddoc, try parser.documentGetInputEncoding(ccur));
64-
}
52+
const doc = try parser.documentCreateDocument(
53+
try parser.documentHTMLGetTitle(userctx.document),
54+
);
55+
56+
// we have to work w/ document instead of html document.
57+
const ddoc = parser.documentHTMLToDocument(doc);
58+
const ccur = parser.documentHTMLToDocument(userctx.document);
59+
try parser.documentSetDocumentURI(ddoc, try parser.documentGetDocumentURI(ccur));
60+
try parser.documentSetInputEncoding(ddoc, try parser.documentGetInputEncoding(ccur));
6561

6662
return doc;
6763
}

src/dom/document_fragment.zig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,8 @@ pub const DocumentFragment = struct {
3535
pub const mem_guarantied = true;
3636

3737
pub fn constructor(userctx: UserContext) !*parser.DocumentFragment {
38-
if (userctx.document == null) return parser.DOMError.NotSupported;
39-
4038
return parser.documentCreateDocumentFragment(
41-
parser.documentHTMLToDocument(userctx.document.?),
39+
parser.documentHTMLToDocument(userctx.document),
4240
);
4341
}
4442
};

src/dom/text.zig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,8 @@ pub const Text = struct {
4141
pub const mem_guarantied = true;
4242

4343
pub fn constructor(userctx: UserContext, data: ?[]const u8) !*parser.Text {
44-
if (userctx.document == null) return parser.DOMError.NotSupported;
45-
4644
return parser.documentCreateTextNode(
47-
parser.documentHTMLToDocument(userctx.document.?),
45+
parser.documentHTMLToDocument(userctx.document),
4846
data orelse "",
4947
);
5048
}

src/user_context.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ const std = @import("std");
22
const parser = @import("netsurf.zig");
33

44
pub const UserContext = struct {
5-
document: ?*parser.DocumentHTML,
5+
document: *parser.DocumentHTML,
66
};

0 commit comments

Comments
 (0)