Skip to content

Lightpanda: the headless browser designed for AI and automation

move initial page creation to createPage

Muki Kiboigo87e740382627
diff --git a/src/browser/Session.zig b/src/browser/Session.zig
index d6720c39d..82ead91b6 100644
--- a/src/browser/Session.zig
+++ b/src/browser/Session.zig
@@ -366,7 +366,20 @@ pub fn createPage(self: *Session) !PageHandle {
}
const frame_id = self.nextFrameId();
- _ = try self.installNewActivePage(frame_id);
+ const frame = try self.installNewActivePage(frame_id);
+
+ // https://html.spec.whatwg.org/multipage/document-sequences.html --
+ // Creating a new browsing context always produces an initial about:blank
+ // Document with its own session history entry, even before any real
+ // navigation happens. Without this, navigation.currentEntry crashes on
+ // a page that hasn't navigated yet.
+ _ = try self.navigation.pushEntry(
+ frame.url,
+ .{ .source = .navigation, .value = null },
+ frame,
+ false,
+ );
+ self.navigation._initial_entry = true;
return .{ .session = self, .frame_id = frame_id };
}
diff --git a/src/browser/webapi/navigation/Navigation.zig b/src/browser/webapi/navigation/Navigation.zig
index 6dc58660a..c4f8b6f19 100644
--- a/src/browser/webapi/navigation/Navigation.zig
+++ b/src/browser/webapi/navigation/Navigation.zig
@@ -53,6 +53,11 @@ _entries: std.ArrayList(*NavigationHistoryEntry) = .empty,
_next_entry_id: usize = 0,
_activation: ?NavigationActivation = null,
+// True right after createPage seeds the synthetic initial about:blank
+// entry, and never otherwise. Per spec, the first real navigation away
+// from that initial entry replaces it.
+_initial_entry: bool = false,
+
fn asEventTarget(self: *Navigation) *EventTarget {
return self._proto;
}
@@ -162,14 +167,19 @@ pub fn commitNavigation(self: *Navigation, frame: *Frame) !void {
defer self._current_navigation_kind = null;
const from_entry = self.getCurrentEntryOrNull();
+ const was_initial_entry = self._initial_entry;
if (from_entry == null) {
kind = .{ .push = null };
+ } else if (was_initial_entry) {
+ kind = .{ .replace = null };
}
+ self._initial_entry = false;
try self.updateEntries(url, kind, frame, false);
self._activation = NavigationActivation{
- ._from = from_entry,
+ // If we are navigating away from the initial about:blank, we have no from.
+ ._from = if (was_initial_entry) null else from_entry,
._entry = self.getCurrentEntry(),
._type = kind.toNavigationType(),
};
diff --git a/src/server/cdp/domains/target.zig b/src/server/cdp/domains/target.zig
index 450452533..0e906a37c 100644
--- a/src/server/cdp/domains/target.zig
+++ b/src/server/cdp/domains/target.zig
@@ -221,17 +221,6 @@ fn createTarget(cmd: *CDP.Command) !void {
try doAttachtoTarget(cmd, target_id);
}
- // https://html.spec.whatwg.org/multipage/document-sequences.html --
- // Creating a new browsing context always produces an initial about:blank
- // Document with its own session history entry, even before any real
- // navigation happens.
- _ = try frame._session.navigation.pushEntry(
- frame.url,
- .{ .source = .navigation, .value = null },
- frame,
- false,
- );
-
if (!std.mem.eql(u8, "about:blank", params.url)) {
const encoded_url = try URL.resolveNavigation(frame.call_arena, params.url, .{});
try frame.navigate(