mirror of
https://github.com/lightpanda-io/browser.git
synced 2026-03-22 04:34:44 +00:00
move page error HTML creation into pageDoneCallback
Now pageErrCllaback call pageDoneCallback to finalize the page.
This commit is contained in:
@@ -789,23 +789,9 @@ fn pageDoneCallback(ctx: *anyopaque) !void {
|
||||
self._parse_state = .{ .complete = {} };
|
||||
self.documentIsComplete();
|
||||
},
|
||||
else => unreachable,
|
||||
}
|
||||
}
|
||||
|
||||
fn pageErrorCallback(ctx: *anyopaque, err: anyerror) void {
|
||||
log.err(.page, "navigate failed", .{ .err = err });
|
||||
|
||||
var self: *Page = @ptrCast(@alignCast(ctx));
|
||||
self.clearTransferArena();
|
||||
self._parse_state = .{ .err = err };
|
||||
defer self.documentIsComplete();
|
||||
|
||||
// Generate a pseudo HTML page indicating the navigation falilure.
|
||||
const parse_arena = self.getArena(.{ .debug = "Page.parse" }) catch |e| {
|
||||
log.err(.browser, "get arena on pageErrorCallback", .{ .err = e });
|
||||
return;
|
||||
};
|
||||
.err => |err| {
|
||||
// Generate a pseudo HTML page indicating the failure.
|
||||
const parse_arena = try self.getArena(.{ .debug = "Page.parse" });
|
||||
defer self.releaseArena(parse_arena);
|
||||
|
||||
const html = std.mem.concat(parse_arena, u8, &.{
|
||||
@@ -816,6 +802,24 @@ fn pageErrorCallback(ctx: *anyopaque, err: anyerror) void {
|
||||
|
||||
var parser = Parser.init(parse_arena, self.document.asNode(), self);
|
||||
parser.parse(html);
|
||||
self.documentIsComplete();
|
||||
},
|
||||
else => unreachable,
|
||||
}
|
||||
}
|
||||
|
||||
fn pageErrorCallback(ctx: *anyopaque, err: anyerror) void {
|
||||
log.err(.page, "navigate failed", .{ .err = err });
|
||||
|
||||
var self: *Page = @ptrCast(@alignCast(ctx));
|
||||
self._parse_state = .{ .err = err };
|
||||
|
||||
// In case of error, we want to complete the page with a custom HTML
|
||||
// containing the error.
|
||||
pageDoneCallback(ctx) catch |e| {
|
||||
log.err(.browser, "pageErrorCallback", .{ .err = e });
|
||||
return;
|
||||
};
|
||||
}
|
||||
|
||||
// The transfer arena is useful and interesting, but has a weird lifetime.
|
||||
|
||||
Reference in New Issue
Block a user