mirror of
https://github.com/lightpanda-io/browser.git
synced 2025-10-29 23:23:28 +00:00
fix merge conflict
This commit is contained in:
@@ -701,8 +701,7 @@ pub const Page = struct {
|
|||||||
// so we load a blank document to navigate away from any prior page.
|
// so we load a blank document to navigate away from any prior page.
|
||||||
self.mode = .{ .parsed = {} };
|
self.mode = .{ .parsed = {} };
|
||||||
|
|
||||||
var fbs = std.io.fixedBufferStream("");
|
const html_doc = try parser.documentHTMLParseFromStr("");
|
||||||
const html_doc = try parser.documentHTMLParse(fbs.reader(), "utf-8");
|
|
||||||
try self.setDocument(html_doc);
|
try self.setDocument(html_doc);
|
||||||
|
|
||||||
self.documentIsComplete();
|
self.documentIsComplete();
|
||||||
@@ -768,10 +767,6 @@ pub const Page = struct {
|
|||||||
self.documentIsComplete();
|
self.documentIsComplete();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
.pre => {
|
|
||||||
// we didn't get any data.
|
|
||||||
self.documentIsComplete();
|
|
||||||
},
|
|
||||||
else => {
|
else => {
|
||||||
log.err(.app, "unreachable mode", .{ .mode = self.mode });
|
log.err(.app, "unreachable mode", .{ .mode = self.mode });
|
||||||
unreachable;
|
unreachable;
|
||||||
|
|||||||
Reference in New Issue
Block a user